diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-30 22:46:46 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-01-30 22:46:46 +0100 |
| commit | 97d1a4c99754ea61eb7899f9c0ca23e4667820e0 (patch) | |
| tree | 27c0da5172b005a7990e67116eec0230cb6c56c9 /.gitignore | |
| parent | 0ed93a9a3236d81829bac431f6b5ae6c6c748648 (diff) | |
| parent | 1e193407fda806d9cc44116ff439de47bf2cbf70 (diff) | |
Merge remote-tracking branch 'upstream/2.2'
Conflicts:
res/controllers/American-Audio-RADIUS-2000-scripts.js
res/controllers/Behringer-BCD3000-Advanced-scripts.js
res/controllers/Behringer-BCD3000-scripts.js
res/controllers/Hercules-DJ-Console-Mk4-scripts.js
res/controllers/common-hid-packet-parser.js
res/skins/Tango/style.qss
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 84df7f16ac..ba9739c668 100644 --- a/.gitignore +++ b/.gitignore @@ -58,5 +58,6 @@ lib/*/lib/*.lib lib/qtscript-bytearray/*.cc +.idea *.vscode compile_commands.json |