← Back to branch summary

~brandontschaefer/unity/lp.1237132-fix

~brandontschaefer/unity/lp.1237132-fix

Viewing all changes in revision 3144.4.85.

Committer: Marco Trevisan (Treviño)
Date: 2013-03-07 22:48:41 UTC
mfrom: (3198 trunk)
mto: This revision was merged to the branch mainline in revision 3200.
Revision ID: mail@3v1n0.net-20130307224841-pny400mqo7uzlc7w

Merging with trunk

files added:
UnityCore/GnomeSessionManager.cpp

tests/test_gnome_session_manager.cpp

files removed:
UnityCore/GnomeSessionManager.cpp

files modified:
UnityCore/GLibDBusProxy.cpp

UnityCore/GLibDBusProxy.h

UnityCore/GLibDBusServer.cpp

UnityCore/GnomeSessionManager.h

UnityCore/GnomeSessionManagerImpl.h

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

tests/CMakeLists.txt

tests/mock-application.h

tests/test_application_launcher_icon.cpp

tests/test_gdbus_proxy.cpp

tests/test_glib_dbus_server.cpp

tests/test_launcher.cpp

tests/test_software_center_launcher_icon.cpp

Show diffs side-by-side

added added

removed removed

UnityCore/GLibDBusProxy.cpp

UnityCore/GLibDBusProxy.h

UnityCore/GLibDBusServer.cpp

UnityCore/GnomeSessionManager.cpp

UnityCore/GnomeSessionManager.cpp

UnityCore/GnomeSessionManager.h

UnityCore/GnomeSessionManagerImpl.h

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ApplicationLauncherIcon.h

launcher/Launcher.cpp

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/MockLauncherIcon.h

tests/CMakeLists.txt

tests/mock-application.h

tests/test_application_launcher_icon.cpp

tests/test_gdbus_proxy.cpp

tests/test_glib_dbus_server.cpp

tests/test_gnome_session_manager.cpp

tests/test_launcher.cpp

tests/test_software_center_launcher_icon.cpp

Older »