Viewing all changes in revision 2659.
- Committer: RJ Ryan
- Date: 2011-03-20 05:05:20 UTC
- mfrom: (2656.1.19 mixxx-trunk)
- Revision ID: rryan@mit.edu-20110320050520-z9i1qaj70ktl1ikd
Merging from lp:mixxx
- files added:
- mixxx/lib/apple
- mixxx/lib/gmock-1.5.0
- mixxx/lib/gmock-1.5.0/build-aux
- mixxx/lib/gmock-1.5.0/fused-src
- mixxx/lib/gmock-1.5.0/fused-src/gmock
- mixxx/lib/gmock-1.5.0/fused-src/gtest
- mixxx/lib/gmock-1.5.0/include
- mixxx/lib/gmock-1.5.0/include/gmock
- mixxx/lib/gmock-1.5.0/include/gmock/internal
- mixxx/lib/gmock-1.5.0/lib
- mixxx/lib/gmock-1.5.0/make
- mixxx/lib/gmock-1.5.0/msvc
- mixxx/lib/gmock-1.5.0/scripts
- mixxx/lib/gmock-1.5.0/scripts/generator
- mixxx/lib/gmock-1.5.0/scripts/generator/cpp
- mixxx/lib/gmock-1.5.0/scripts/test
- mixxx/lib/gmock-1.5.0/src
- mixxx/lib/gmock-1.5.0/test
- mixxx/lib/gtest-1.5.0
- mixxx/lib/gtest-1.5.0/build-aux
- mixxx/lib/gtest-1.5.0/codegear
- mixxx/lib/gtest-1.5.0/fused-src
- mixxx/lib/gtest-1.5.0/fused-src/gtest
- mixxx/lib/gtest-1.5.0/include
- mixxx/lib/gtest-1.5.0/include/gtest
- mixxx/lib/gtest-1.5.0/include/gtest/internal
- mixxx/lib/gtest-1.5.0/lib
- mixxx/lib/gtest-1.5.0/m4
- mixxx/lib/gtest-1.5.0/make
- mixxx/lib/gtest-1.5.0/msvc
- mixxx/lib/gtest-1.5.0/samples
- mixxx/lib/gtest-1.5.0/scripts
- mixxx/lib/gtest-1.5.0/scripts/test
- mixxx/lib/gtest-1.5.0/src
- mixxx/lib/gtest-1.5.0/test
- mixxx/lib/gtest-1.5.0/xcode
- mixxx/lib/gtest-1.5.0/xcode/Config
- mixxx/lib/gtest-1.5.0/xcode/Resources
- mixxx/lib/gtest-1.5.0/xcode/Samples
- mixxx/lib/gtest-1.5.0/xcode/Samples/FrameworkSample
- mixxx/lib/gtest-1.5.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj
- mixxx/lib/gtest-1.5.0/xcode/Scripts
- mixxx/lib/gtest-1.5.0/xcode/gtest.xcodeproj
- mixxx/src/library/browse
- files removed:
- asmlib
- mixxx-linlib
- mixxx-linlib/includes
- mixxx-linlib/includes/ogg
- mixxx-linlib/includes/vorbis
- mixxx-linlib/libs
- mixxx-maclib
- mixxx-maclib/include
- mixxx-maclib/include/ogg
- mixxx-maclib/include/vorbis
- mixxx-maclib/lib
- mixxx-maclib/x86
- mixxx-maclib/x86/lib
- mixxx-win32lib-mingw
- mixxx-win32lib-mingw/faad2
- mixxx-win32lib-mingw/faad2/include
- mixxx-win32lib-mingw/mp4v2
- mixxx-win32lib-mingw/mp4v2/include
- mixxx-win32lib-mingw/mp4v2/include/mp4v2
- mixxx-win32lib-mingw/mp4v2/mingw-bin
- mixxx-win32lib-msvc
- mixxx-win32lib-msvc/FLAC
- mixxx-win32lib-msvc/HSS1394
- mixxx-win32lib-msvc/ogg
- mixxx-win32lib-msvc/shout
- mixxx-win32lib-msvc/taglib
- mixxx-win32lib-msvc/vorbis
- mixxx-win64lib-mingw
- mixxx-win64lib-msvc
- mixxx-win64lib-msvc/FLAC
- mixxx-win64lib-msvc/HSS1394
- mixxx-win64lib-msvc/ogg
- mixxx-win64lib-msvc/shout
- mixxx-win64lib-msvc/taglib
- mixxx-win64lib-msvc/vorbis
- mixxx/lib/gtest-1.3.0
- mixxx/lib/gtest-1.3.0/build-aux
- mixxx/lib/gtest-1.3.0/include
- mixxx/lib/gtest-1.3.0/include/gtest
- mixxx/lib/gtest-1.3.0/include/gtest/internal
- mixxx/lib/gtest-1.3.0/m4
- mixxx/lib/gtest-1.3.0/make
- mixxx/lib/gtest-1.3.0/msvc
- mixxx/lib/gtest-1.3.0/samples
- mixxx/lib/gtest-1.3.0/scons
- mixxx/lib/gtest-1.3.0/scripts
- mixxx/lib/gtest-1.3.0/scripts/test
- mixxx/lib/gtest-1.3.0/src
- mixxx/lib/gtest-1.3.0/test
- mixxx/lib/gtest-1.3.0/xcode
- mixxx/lib/gtest-1.3.0/xcode/Config
- mixxx/lib/gtest-1.3.0/xcode/Resources
- mixxx/lib/gtest-1.3.0/xcode/Samples
- mixxx/lib/gtest-1.3.0/xcode/Samples/FrameworkSample
- mixxx/lib/gtest-1.3.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj
- mixxx/lib/gtest-1.3.0/xcode/Scripts
- mixxx/lib/gtest-1.3.0/xcode/gtest.xcodeproj
- files renamed:
- mixxx/src/library/browsefeature.cpp => mixxx/src/library/browse/browsefeature.cpp
- mixxx/src/library/browsefeature.h => mixxx/src/library/browse/browsefeature.h
- mixxx/src/library/browsetablemodel.cpp => mixxx/src/library/browse/browsetablemodel.cpp
- mixxx/src/library/browsetablemodel.h => mixxx/src/library/browse/browsetablemodel.h
- mixxx/src/library/browsethread.cpp => mixxx/src/library/browse/browsethread.cpp
- mixxx/src/library/browsethread.h => mixxx/src/library/browse/browsethread.h
- mixxx/src/library/foldertreemodel.cpp => mixxx/src/library/browse/foldertreemodel.cpp
- mixxx/src/library/foldertreemodel.h => mixxx/src/library/browse/foldertreemodel.h
- files modified:
- mixxx/build/depends.py
expand all
collapse all
added
removed
