~mixxxdevelopers/mixxx/trunk

« back to all changes in this revision

Viewing changes to mixxx/res/mixxx.qrc

Committer: RJ Ryan
Date: 2012-03-12 05:23:47 UTC
mfrom: (2840.2.23 mixxx-setlog)
Revision ID: rryan@mit.edu-20120312052347-ej5ryah1p3nag2dq

Merging Daniel Schürmann's session history branch into lp:mixxx. Thanks Daniel!

files added:
mixxx/res/html/setlogs.html

mixxx/res/images/library/ic_library_setlog.png

mixxx/res/images/library/ic_library_setlog_current.png

mixxx/src/library/baseplaylistfeature.cpp

mixxx/src/library/baseplaylistfeature.h

mixxx/src/library/parsercsv.cpp

mixxx/src/library/parsercsv.h

mixxx/src/library/setlogfeature.cpp

mixxx/src/library/setlogfeature.h

files modified:
mixxx/build/depends.py

mixxx/res/mixxx.qrc

mixxx/src/basetrackplayer.cpp

mixxx/src/dlgautodj.cpp

mixxx/src/library/basesqltablemodel.cpp

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratefeature.h

mixxx/src/library/dao/cratedao.cpp

mixxx/src/library/dao/cratedao.h

mixxx/src/library/dao/playlistdao.cpp

mixxx/src/library/dao/playlistdao.h

mixxx/src/library/legacylibraryimporter.cpp

mixxx/src/library/library.cpp

mixxx/src/library/libraryfeature.h

mixxx/src/library/parser.cpp

mixxx/src/library/playlistfeature.cpp

mixxx/src/library/playlistfeature.h

mixxx/src/library/playlisttablemodel.cpp

mixxx/src/library/playlisttablemodel.h

mixxx/src/library/preparefeature.cpp

mixxx/src/library/sidebarmodel.cpp

mixxx/src/library/sidebarmodel.h

mixxx/src/library/trackcollection.cpp

mixxx/src/mixxx.cpp

mixxx/src/playerinfo.cpp

mixxx/src/playerinfo.h

mixxx/src/trackinfoobject.cpp

mixxx/src/trackinfoobject.h

mixxx/src/widget/wlibrarysidebar.cpp

Show diffs side-by-side

added added

removed removed

mixxx/res/mixxx.qrc

<file>images/autodj/bottom.svg</file>

<file>html/crates.html</file>

<file>html/playlists.html</file>

<file>html/setlogs.html</file>

<file>images/mixxx-icon.png</file>

<file>images/ic_mixxx_window.png</file>

<file>images/templates/logo_mixxx.png</file>

<file>images/library/ic_library_rhythmbox.png</file>

<file>images/library/ic_library_traktor.png</file>

<file>images/library/ic_library_recordings.png</file>

<file>images/library/ic_library_setlog.png</file>

<file>images/library/ic_library_setlog_current.png</file>

<file>translations/mixxx_ar.qm</file>

<file>translations/mixxx_bg.qm</file>

<file>translations/mixxx_br.qm</file>

Older »