Merge lp:~vanvugt/mir/version-0.1.2 into lp:mir

[Daniel van Vugt]

Prepare for version 0.1.2

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1246
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/142/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/413/rebuild

review: Approve (continuous-integration)

[kevin gunn (kgunn72)]

lgtm

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-30 03:58:07 +0000
+++ CMakeLists.txt	2013-11-21 03:50:15 +0000
@@ -28,7 +28,7 @@
 
 set(MIR_VERSION_MAJOR 0)
 set(MIR_VERSION_MINOR 1)
-set(MIR_VERSION_PATCH 1)
+set(MIR_VERSION_PATCH 2)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-21 03:50:14 +0000
+++ debian/changelog	2013-11-21 03:50:15 +0000
@@ -1,3 +1,9 @@
+mir (0.1.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * Prepare for release 0.1.2 (TODO)
+
+ -- Daniel van Vugt <[e-mail]>  Thu, 21 Nov 2013 11:17:36 +0800
+
 mir (0.1.1+14.04.20131120-0ubuntu1) trusty; urgency=low
 
   [ Daniel van Vugt ]