← Back to branch summary

~macslow/+junk/unity-phablet-notification-renderer-debug-crash-2

~macslow/+junk/unity-phablet-notification-renderer-debug-crash-2

Viewing all changes in revision 587.

Committer: Mirco Müller
Date: 2013-04-23 16:23:40 UTC
mfrom: (507.2.114 phablet)
Revision ID: mirco.mueller@ubuntu.com-20130423162340-titjw06dugbgbk7o

Re-merge with lp:unity/phablet

files added:
Dash/Apps/CloseIcon.qml

Dash/Apps/graphics

Dash/Apps/graphics/close_btn@9.png

debian/libunity-api-doc.install

doc

doc/Doxyfile.in

include/unity/api/internal

include/unity/scopes/internal

tests/copyright

tests/copyright/CMakeLists.txt

tests/copyright/check_copyright.sh

tests/headers

tests/headers/CMakeLists.txt

tests/headers/check_public_headers.py

tests/headers/compile_headers.py

tests/qmltests/Dash/Apps

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml

tests/qmltests/plugins/Unity

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_lens.cpp

tests/qmltests/plugins/Unity/fake_lens.h

tests/qmltests/plugins/Unity/fake_lenses.cpp

tests/qmltests/plugins/Unity/fake_lenses.h

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

tests/qmltests/plugins/Unity/fake_unity_plugin.h

tests/qmltests/plugins/Unity/qmldir

files modified:
CMakeLists.txt

Components/ApplicationManagerWrapper.qml

Components/Carousel.qml

Components/FilterGrid.qml

Components/ResponsiveFlowView.qml

Dash/Apps/RunningApplicationTile.qml

Dash/Apps/RunningApplicationsGrid.qml

Dash/DashApps.qml

Dash/DashPeople.qml

Dash/DashVideos.qml

Dash/People/PeopleFilterGrid.qml

Dash/Video/VideosFilterGrid.qml

debian/control

include/CMakeLists.txt

include/unity/CMakeLists.txt

include/unity/api/CMakeLists.txt

include/unity/api/Version.h.in

include/unity/scopes/CMakeLists.txt

include/unity/util/CMakeLists.txt

plugins/Unity/categoryfilter.cpp

plugins/Unity/categoryfilter.h

runtests.sh

src/CMakeLists.txt

src/unity/CMakeLists.txt

src/unity/api/CMakeLists.txt

src/unity/api/internal/CMakeLists.txt

src/unity/api/scopes/CMakeLists.txt

src/unity/api/scopes/internal/CMakeLists.txt

src/unity/internal/CMakeLists.txt

src/unity/util/CMakeLists.txt

src/unity/util/internal/CMakeLists.txt

tests/CMakeLists.txt

tests/gtest/CMakeLists.txt

tests/gtest/libgtest/CMakeLists.txt

tests/gtest/unity/CMakeLists.txt

tests/gtest/unity/api/CMakeLists.txt

tests/gtest/unity/api/Version/CMakeLists.txt

tests/gtest/unity/scopes/CMakeLists.txt

tests/gtest/unity/util/CMakeLists.txt

tests/gtest/unity/util/Daemon/CMakeLists.txt

tests/gtest/unity/util/DefinesPtrs/CMakeLists.txt

tests/gtest/unity/util/FileIO/CMakeLists.txt

tests/gtest/unity/util/internal/CMakeLists.txt

tests/gtest/unity/util/internal/ResourcePtr/CMakeLists.txt

tests/mocks/Ubuntu/Application/ApplicationListModel.cpp

tests/mocks/Ubuntu/Application/ApplicationListModel.h

tests/mocks/Ubuntu/Application/ApplicationManager.cpp

tests/mocks/Ubuntu/Application/ApplicationManager.h

tests/mocks/Ubuntu/Application/plugin.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_FilterGrid.qml

tests/qmltests/plugins/CMakeLists.txt

tests/whitespace/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

Components/ApplicationManagerWrapper.qml

Components/Carousel.qml

Components/FilterGrid.qml

Components/ResponsiveFlowView.qml

Dash/Apps/CloseIcon.qml

Dash/Apps/RunningApplicationTile.qml

Dash/Apps/RunningApplicationsGrid.qml

Dash/Apps/graphics/

Dash/Apps/graphics/close_btn@9.png

Dash/DashApps.qml

Dash/DashPeople.qml

Dash/DashVideos.qml

Dash/People/PeopleFilterGrid.qml

Dash/Video/VideosFilterGrid.qml

debian/libunity-api-doc.install

doc/Doxyfile.in

include/CMakeLists.txt

include/unity/CMakeLists.txt

include/unity/api/CMakeLists.txt

include/unity/api/Version.h.in

include/unity/api/internal/

include/unity/scopes/CMakeLists.txt

include/unity/scopes/internal/

include/unity/util/CMakeLists.txt

src/CMakeLists.txt

src/unity/CMakeLists.txt

src/unity/api/CMakeLists.txt

src/unity/api/internal/CMakeLists.txt

src/unity/api/scopes/CMakeLists.txt

src/unity/api/scopes/internal/CMakeLists.txt

src/unity/internal/CMakeLists.txt

src/unity/util/CMakeLists.txt

src/unity/util/internal/CMakeLists.txt

tests/CMakeLists.txt

tests/copyright/

tests/copyright/CMakeLists.txt

tests/copyright/check_copyright.sh

tests/gtest/CMakeLists.txt

tests/gtest/libgtest/CMakeLists.txt

tests/gtest/unity/CMakeLists.txt

tests/gtest/unity/api/CMakeLists.txt

tests/gtest/unity/api/Version/CMakeLists.txt

tests/gtest/unity/scopes/CMakeLists.txt

tests/gtest/unity/util/CMakeLists.txt

tests/gtest/unity/util/Daemon/CMakeLists.txt

tests/gtest/unity/util/DefinesPtrs/CMakeLists.txt

tests/gtest/unity/util/FileIO/CMakeLists.txt

tests/gtest/unity/util/internal/CMakeLists.txt

tests/gtest/unity/util/internal/ResourcePtr/CMakeLists.txt

tests/headers/CMakeLists.txt

tests/headers/check_public_headers.py

tests/headers/compile_headers.py

tests/mocks/Ubuntu/Application/ApplicationListModel.cpp

tests/mocks/Ubuntu/Application/ApplicationListModel.h

tests/mocks/Ubuntu/Application/ApplicationManager.cpp

tests/mocks/Ubuntu/Application/ApplicationManager.h

tests/mocks/Ubuntu/Application/plugin.cpp

tests/qmltests/CMakeLists.txt

tests/qmltests/Components/tst_FilterGrid.qml

tests/qmltests/Dash/Apps/

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml

tests/qmltests/plugins/CMakeLists.txt

tests/qmltests/plugins/Unity/

tests/qmltests/plugins/Unity/CMakeLists.txt

tests/qmltests/plugins/Unity/fake_lens.cpp

tests/qmltests/plugins/Unity/fake_lens.h

tests/qmltests/plugins/Unity/fake_lenses.cpp

tests/qmltests/plugins/Unity/fake_lenses.h

tests/qmltests/plugins/Unity/fake_unity_plugin.cpp

tests/qmltests/plugins/Unity/fake_unity_plugin.h

tests/qmltests/plugins/Unity/qmldir

tests/whitespace/CMakeLists.txt

Older »