diff options
| author | RJ Ryan <rryan@mixxx.org> | 2013-06-19 01:12:50 -0400 |
|---|---|---|
| committer | RJ Ryan <rryan@mixxx.org> | 2013-06-19 01:12:50 -0400 |
| commit | 52d6c28ded7b3d7e9ae3874fc893c6b306147931 (patch) | |
| tree | a2729bd5686b5c13684510d0196862a76c8aedab | |
| parent | f62fd9ee125cbd22be97ce5f837f30b8ef443842 (diff) | |
| parent | 25d57b59dff3947212909634864dd82365c9606b (diff) | |
Merge branch 'master' into features_effects
Conflicts:
res/skins/Outline1024x600-Netbook/keylock-off-Ch1.png
res/skins/Outline1024x600-Netbook/keylock-off-Ch2.png
res/skins/Outline1024x600-Netbook/keylock-on-Ch1.png
res/skins/Outline1024x600-Netbook/keylock-on-Ch2.png
| -rw-r--r-- | COPYING (renamed from mixxx/COPYING) | 0 | ||||
| -rw-r--r-- | LICENSE (renamed from mixxx/LICENSE) | 0 | ||||
| -rw-r--r-- | Mixxx-Manual.pdf (renamed from mixxx/Mixxx-Manual.pdf) | bin | 4492236 -> 4492236 bytes | |||
| -rw-r--r-- | README (renamed from mixxx/README) | 0 | ||||
| -rw-r--r-- | SConstruct (renamed from mixxx/SConstruct) | 0 | ||||
| -rw-r--r-- | build/__init__.py (renamed from mixxx/build/__init__.py) | 0 | ||||
| -rw-r--r-- | build/crossmingw.py (renamed from mixxx/build/crossmingw.py) | 0 | ||||
| -rw-r--r-- | build/debian/changelog (renamed from mixxx/build/debian/changelog) | 0 | ||||
| -rw-r--r-- | build/debian/compat (renamed from mixxx/build/debian/compat) | 0 | ||||
| -rw-r--r-- | build/debian/control (renamed from mixxx/build/debian/control) | 0 | ||||
| -rw-r--r-- | build/debian/control.lucid (renamed from mixxx/build/debian/control.lucid) | 0 | ||||
| -rw-r--r-- | build/debian/control.maverick (renamed from mixxx/build/debian/control.maverick) | 0 | ||||
| -rw-r--r-- | build/debian/control.natty (renamed from mixxx/build/debian/control.natty) | 0 | ||||
| -rw-r--r-- | build/debian/control.oneiric (renamed from mixxx/build/debian/control.oneiric) | 0 | ||||
| -rw-r--r-- | build/debian/control.precise (renamed from mixxx/build/debian/control.precise) | 0 | ||||
| -rw-r--r-- | build/debian/copyright (renamed from mixxx/build/debian/copyright) | 0 | ||||
| -rw-r--r-- | build/debian/dirs (renamed from mixxx/build/debian/dirs) | 0 | ||||
| -rw-r--r-- | build/debian/menu (renamed from mixxx/build/debian/menu) | 0 | ||||
| -rw-r--r-- | build/debian/mixxx.desktop (renamed from mixxx/build/debian/mixxx.desktop) | 0 | ||||
| -rw-r--r-- | build/debian/mixxx.docs (renamed from mixxx/build/debian/mixxx.docs) | 0 | ||||
| -rw-r--r-- | build/debian/mixxx.install (renamed from mixxx/build/debian/mixxx.install) | 0 | ||||
| -rw-r--r-- | build/debian/mixxx.links (renamed from mixxx/build/debian/mixxx.links) | 0 | ||||
| -rw-r--r-- | build/debian/mixxx.sgml (renamed from mixxx/build/debian/mixxx.sgml) | 0 | ||||
| -rwxr-xr-x | build/debian/rules (renamed from mixxx/build/debian/rules) | 0 | ||||
| -rw-r--r-- | build/debian/watch (renamed from mixxx/build/debian/watch) | 0 | ||||
| -rw-r--r-- | build/depends.py (renamed from mixxx/build/depends.py) | 0 | ||||
| -rw-r--r-- | build/features.py (renamed from mixxx/build/features.py) | 0 | ||||
| -rw-r--r-- | build/mingw-x/mkspecs/i586-mingw32msvc-g++/qmake.conf (renamed from mixxx/build/mingw-x/mkspecs/i586-mingw32msvc-g++/qmake.conf) | 0 | ||||
| -rw-r--r-- | build/mingw-x/mkspecs/i586-mingw32msvc-g++/qplatformdefs.h (renamed from mixxx/build/mingw-x/mkspecs/i586-mingw32msvc-g++/qplatformdefs.h) | 0 | ||||
| -rwxr-xr-x | build/mingw-x/x-compile.sh (renamed from mixxx/build/mingw-x/x-compile.sh) | 0 | ||||
| -rw-r--r-- | build/mixxx.py (renamed from mixxx/build/mixxx.py) | 0 | ||||
| -rw-r--r-- | build/nsis/Mixxx-garth.nsi (renamed from mixxx/build/nsis/Mixxx-garth.nsi) | 0 | ||||
| -rw-r--r-- | build/nsis/Mixxx-old.nsi (renamed from mixxx/build/nsis/Mixxx-old.nsi) | 0 | ||||
| -rw-r--r-- | build/nsis/Mixxx.nsi (renamed from mixxx/build/nsis/Mixxx.nsi) | 0 | ||||
| -rw-r--r-- | build/osx/OSConsX.py (renamed from mixxx/build/osx/OSConsX.py) | 0 | ||||
| -rw-r--r-- | build/osx/README (renamed from mixxx/build/osx/README) | 0 | ||||
| -rw-r--r-- | build/osx/crossosx.py (renamed from mixxx/build/osx/crossosx.py) | 0 | ||||
| -rw-r--r-- | build/osx/entitlements.plist (renamed from mixxx/build/osx/entitlements.plist) | 0 | ||||
| -rw-r--r-- | build/osx/otool.py (renamed from mixxx/build/osx/otool.py) | 0 | ||||
| -rw-r--r-- | build/osx/product_definition.plist (renamed from mixxx/build/osx/product_definition.plist) | 0 | ||||
| -rw-r--r-- | build/protoc.py (renamed from mixxx/build/protoc.py) | 0 | ||||
| -rw-r--r-- | build/qt4.py (renamed from mixxx/build/qt4.py) | 0 | ||||
| -rw-r--r-- | build/qtcreator/mixxx.pro (renamed from mixxx/build/qtcreator/mixxx.pro) | 0 | ||||
| -rwxr-xr-x | build/unused/create_mixxx_dmg.sh (renamed from mixxx/build/unused/create_mixxx_dmg.sh) | 0 | ||||
| -rw-r--r-- | build/unused/mixxx_dmg.sh (renamed from mixxx/build/unused/mixxx_dmg.sh) | 0 | ||||
| -rw-r--r-- | build/util.py (renamed from mixxx/build/util.py) | 0 | ||||
| -rw-r--r-- | doc/HID/HID Packet Parser Documentation.odt (renamed from mixxx/doc/HID/HID Packet Parser Documentation.odt) | bin | 18113 -> 18113 bytes | |||
| -rw-r--r-- | doc/HID/HID Packet Parser Documentation.pdf (renamed from mixxx/doc/HID/HID Packet Parser Documentation.pdf) | bin | 119423 -> 119423 bytes | |||
| -rw-r--r-- | lib/apple/CADebugMacros.h (renamed from mixxx/lib/apple/CADebugMacros.h) | 0 | ||||
| -rw-r--r-- | lib/apple/CAStreamBasicDescription.h (renamed from mixxx/lib/apple/CAStreamBasicDescription.h) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/COPYING (renamed from mixxx/lib/fidlib-0.9.10/COPYING) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/COPYING_LIB (renamed from mixxx/lib/fidlib-0.9.10/COPYING_LIB) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/fidlib.c (renamed from mixxx/lib/fidlib-0.9.10/fidlib.c) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/fidlib.h (renamed from mixxx/lib/fidlib-0.9.10/fidlib.h) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/fidmkf.h (renamed from mixxx/lib/fidlib-0.9.10/fidmkf.h) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/fidrf_cmdlist.h (renamed from mixxx/lib/fidlib-0.9.10/fidrf_cmdlist.h) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/fidrf_combined.h (renamed from mixxx/lib/fidlib-0.9.10/fidrf_combined.h) | 0 | ||||
| -rw-r--r-- | lib/fidlib-0.9.10/fidrf_jit.h (renamed from mixxx/lib/fidlib-0.9.10/fidrf_jit.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/CHANGES (renamed from mixxx/lib/gmock-1.5.0/CHANGES) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/CONTRIBUTORS (renamed from mixxx/lib/gmock-1.5.0/CONTRIBUTORS) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/COPYING (renamed from mixxx/lib/gmock-1.5.0/COPYING) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/Makefile.am (renamed from mixxx/lib/gmock-1.5.0/Makefile.am) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/Makefile.in (renamed from mixxx/lib/gmock-1.5.0/Makefile.in) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/README (renamed from mixxx/lib/gmock-1.5.0/README) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/SConscript (renamed from mixxx/lib/gmock-1.5.0/SConscript) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/aclocal.m4 (renamed from mixxx/lib/gmock-1.5.0/aclocal.m4) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/build-aux/config.guess (renamed from mixxx/lib/gmock-1.5.0/build-aux/config.guess) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/build-aux/config.h.in (renamed from mixxx/lib/gmock-1.5.0/build-aux/config.h.in) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/build-aux/config.sub (renamed from mixxx/lib/gmock-1.5.0/build-aux/config.sub) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/build-aux/depcomp (renamed from mixxx/lib/gmock-1.5.0/build-aux/depcomp) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/build-aux/install-sh (renamed from mixxx/lib/gmock-1.5.0/build-aux/install-sh) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/build-aux/ltmain.sh (renamed from mixxx/lib/gmock-1.5.0/build-aux/ltmain.sh) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/build-aux/missing (renamed from mixxx/lib/gmock-1.5.0/build-aux/missing) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/configure (renamed from mixxx/lib/gmock-1.5.0/configure) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/configure.ac (renamed from mixxx/lib/gmock-1.5.0/configure.ac) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/fused-src/gmock-gtest-all.cc (renamed from mixxx/lib/gmock-1.5.0/fused-src/gmock-gtest-all.cc) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/fused-src/gmock/gmock.h (renamed from mixxx/lib/gmock-1.5.0/fused-src/gmock/gmock.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/fused-src/gmock_main.cc (renamed from mixxx/lib/gmock-1.5.0/fused-src/gmock_main.cc) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/fused-src/gtest/gtest.h (renamed from mixxx/lib/gmock-1.5.0/fused-src/gtest/gtest.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-actions.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-actions.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-cardinalities.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-cardinalities.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-actions.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-actions.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-actions.h.pump (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-actions.h.pump) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-function-mockers.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-function-mockers.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-function-mockers.h.pump (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-function-mockers.h.pump) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-matchers.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-matchers.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-matchers.h.pump (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-matchers.h.pump) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-nice-strict.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-nice-strict.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-generated-nice-strict.h.pump (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-generated-nice-strict.h.pump) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-matchers.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-matchers.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-more-actions.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-more-actions.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-printers.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-printers.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock-spec-builders.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock-spec-builders.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/gmock.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/gmock.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/internal/gmock-generated-internal-utils.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/internal/gmock-generated-internal-utils.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/internal/gmock-generated-internal-utils.h.pump (renamed from mixxx/lib/gmock-1.5.0/include/gmock/internal/gmock-generated-internal-utils.h.pump) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/internal/gmock-internal-utils.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/internal/gmock-internal-utils.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/include/gmock/internal/gmock-port.h (renamed from mixxx/lib/gmock-1.5.0/include/gmock/internal/gmock-port.h) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/make/Makefile (renamed from mixxx/lib/gmock-1.5.0/make/Makefile) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/msvc/gmock-spec-builders_test.vcproj (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock-spec-builders_test.vcproj) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/msvc/gmock.sln (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock.sln) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/msvc/gmock.vcproj (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock.vcproj) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/msvc/gmock_config.vsprops (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock_config.vsprops) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/msvc/gmock_link_test.vcproj (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock_link_test.vcproj) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/msvc/gmock_main.vcproj (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock_main.vcproj) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/msvc/gmock_test.vcproj (renamed from mixxx/lib/gmock-1.5.0/msvc/gmock_test.vcproj) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/fuse_gmock_files.py (renamed from mixxx/lib/gmock-1.5.0/scripts/fuse_gmock_files.py) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/scripts/generator/COPYING (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/COPYING) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/scripts/generator/README (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/README) | 0 | ||||
| -rw-r--r-- | lib/gmock-1.5.0/scripts/generator/README.cppclean (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/README.cppclean) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/cpp/__init__.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/cpp/__init__.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/cpp/ast.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/cpp/ast.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/cpp/gmock_class.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/cpp/gmock_class.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/cpp/keywords.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/cpp/keywords.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/cpp/tokenize.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/cpp/tokenize.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/cpp/utils.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/cpp/utils.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/generator/gmock_gen.py (renamed from mixxx/lib/gmock-1.5.0/scripts/generator/gmock_gen.py) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/gmock-config.in (renamed from mixxx/lib/gmock-1.5.0/scripts/gmock-config.in) | 0 | ||||
| -rwxr-xr-x | lib/gmock-1.5.0/scripts/gmock_doctor.py (renamed from mixxx/lib/gmock-1.5.0/scripts/gmock_doctor.py) | 0 | ||||
| -rw-r--r-- |