diff options
| author | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-06-22 00:57:24 +0800 |
|---|---|---|
| committer | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-06-22 00:57:24 +0800 |
| commit | 9e851eab4a1607d1fab492377326a1fcb9b7ce6f (patch) | |
| tree | dcaceeb95d51606f84858b49a79e91ae196415ab | |
| parent | eeac5d29daed7bdb4d0bbb91d13761b891e1fac2 (diff) | |
| parent | f0dd8e56b376beb076b596f7a0027da180cdfb66 (diff) | |
| download | plugins-extra-9e851eab4a1607d1fab492377326a1fcb9b7ce6f.tar.gz plugins-extra-9e851eab4a1607d1fab492377326a1fcb9b7ce6f.tar.bz2 | |
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/plugins-extra
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| m--------- | grid | 0 | ||||
| m--------- | notification | 0 |
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index decf9d3..d86685b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,8 @@ include (CompizPackage) set (COMPIZ_VERSION_MAJOR 0) set (COMPIZ_VERSION_MINOR 9) -set (COMPIZ_VERSION_MICRO 1) -set (COMPIZ_VERSION_MACRO 2) -set (VERSION ${COMPIZ_VERSION_MAJOR}.${COMPIZ_VERSION_MINOR}.${COMPIZ_VERSION_MICRO}.${COMPIZ_VERSION_MACRO}) +set (COMPIZ_VERSION_MICRO 5) +set (VERSION ${COMPIZ_VERSION_MAJOR}.${COMPIZ_VERSION_MINOR}.${COMPIZ_VERSION_MICRO}) set (COMPIZ_PLUGIN_INSTALL_TYPE "package") diff --git a/grid b/grid -Subproject 6566c77b433483f49abfce9a3c9f83d93e950d5 +Subproject fcc746d39070b706f81c2683165a0baadefb315 diff --git a/notification b/notification -Subproject 856126f85f66e13032f78f94d2f572c3db10fff +Subproject 41b8a4e08a7b37c29331789853ee5105538f1a0 |