← Back to branch summary

~canonical-dx-team/unity/unity.fix-ql-losing-focus

~canonical-dx-team/unity/unity.fix-ql-losing-focus

« back to all changes in this revision

Viewing changes to CMakeLists.txt

Committer: Jay Taoko
Date: 2011-02-27 08:25:15 UTC
mfrom: (884.3.1 unity.scrolling-improvements)
mto: (894.1.8 dash-fixes-2011-02-28)
mto: This revision was merged to the branch mainline in revision 895.
Revision ID: jay.taoko@canonical.com-20110227082515-vgjqwdyh2ubvye1b

Merge

files modified:
CMakeLists.txt

services/CMakeLists.txt

services/panel-a11y.c

src/DeviceLauncherIcon.cpp

src/IconTexture.cpp

src/Launcher.cpp

src/Launcher.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/PanelIndicatorObjectEntryView.cpp

src/PanelStyle.cpp

src/PanelStyle.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesView.cpp

src/StaticCairoText.cpp

src/StaticCairoText.h

src/unitya11y.cpp

tools/autopilot.py

Show diffs side-by-side

added added

removed removed

12

12

set (PROJECT_NAME "unity")

13

13

set (UNITY_MAJOR 3)

14

14

set (UNITY_MINOR 4)

15

set (UNITY_MICRO 4)

15

set (UNITY_MICRO 6)

16

16

set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")

17

17

set (UNITY_API_VERSION "3.0")

18

18

Older »