SVN commit 922673 by bettio: Moved clocknumber to train-clock. M +2 -1 CMakeLists.txt M +1 -1 clock.cpp AM clocknumber.cpp trunk/KDE/kdebase/workspace/libs/plasmaclock/clocknumber.cpp#921611 [License: GPL (v2+)] AM clocknumber.h trunk/KDE/kdebase/workspace/libs/plasmaclock/clocknumber.h#921611 [License: GPL (v2+)] --- trunk/playground/base/plasma/applets/train-clock/CMakeLists.txt #922672:922673 @@ -1,7 +1,8 @@ project(plasma-train-clock) set(clock_SRCS - clock.cpp) + clock.cpp + clocknumber.cpp) kde4_add_ui_files(clock_SRCS clockConfig.ui ) kde4_add_plugin(plasma_applet_train_clock ${clock_SRCS}) --- trunk/playground/base/plasma/applets/train-clock/clock.cpp #922672:922673 @@ -20,7 +20,7 @@ ***************************************************************************/ #include "clock.h" -#include "plasmaclock/clocknumber.h" +#include "clocknumber.h" #include ** trunk/playground/base/plasma/applets/train-clock/clocknumber.cpp #property svn:mergeinfo + /branches/KDE/4.0/kdebase/workspace/plasma/libs/libplasmaclock/clocknumber.cpp:758600,758610 ** trunk/playground/base/plasma/applets/train-clock/clocknumber.h #property svn:mergeinfo + /branches/KDE/4.0/kdebase/workspace/plasma/libs/libplasmaclock/clocknumber.h:758600,758610