diff options
| author | Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com> | 2010-12-15 16:58:58 +0100 |
|---|---|---|
| committer | Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com> | 2010-12-15 16:58:58 +0100 |
| commit | 9cff96166419d2bc6feaea6fa7582f6ed4cde5dd (patch) | |
| tree | 17e52ae9bd38efbb6bdfbcd8bc00647331e57bcd /src | |
| parent | 9b30955b6ea12aa56be11f2b899b804033cec088 (diff) | |
| parent | 090c36e7937ba2e55daed3abc6a20af2acbc2428 (diff) | |
Merge lp:~unity-team/unity/enable-vala-tests to reenable the test suite
(bzr r616.1.3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/unityshell.cpp (renamed from src/unity.cpp) | 2 | ||||
| -rw-r--r-- | src/unityshell.h (renamed from src/unity.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/unity.cpp b/src/unityshell.cpp index 7e6e38064..30c66d587 100644 --- a/src/unity.cpp +++ b/src/unityshell.cpp @@ -31,7 +31,7 @@ #include "LauncherController.h" #include "PluginAdapter.h" #include "StartupNotifyService.h" -#include "unity.h" +#include "unityshell.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> diff --git a/src/unity.h b/src/unityshell.h index fb594188f..fb594188f 100644 --- a/src/unity.h +++ b/src/unityshell.h |