diff options
| author | kain88 <kain88@mixxx.org> | 2013-11-16 19:18:06 +0100 |
|---|---|---|
| committer | kain88 <kain88@mixxx.org> | 2013-11-16 19:18:06 +0100 |
| commit | 061838fe6094ff682b309fa37b7403803782cdbe (patch) | |
| tree | 24caead01979e69229d3a26f8f07af7e783be9d2 /.gitignore | |
| parent | e2bfb3cfc19f44af2a3e460373e98626e1cf80f8 (diff) | |
| parent | 481c43d1ba7d4c7286c6ea540fdb455bc9c900ed (diff) | |
Merge remote-tracking branch 'upstream/master' into multiplyFolders
Conflicts:
res/schema.xml
src/dlgpreferences.cpp
src/dlgprefplaylist.cpp
src/dlgprefplaylist.h
src/dlgprefrecord.cpp
src/library/library.cpp
src/library/library.h
src/library/libraryscanner.cpp
src/library/libraryscanner.h
src/library/promotracksfeature.cpp
src/library/trackcollection.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions