Merge lp:~kdub/unity-system-compositor/nochange-rebuild into lp:unity-system-compositor/0.3

[Kevin DuBois]

nochange rebuild for mir 0.18.2.

nochange rebuild for mir 0.18.2.

[lp:~kdub/unity-system-compositor/nochange-rebuild]

271. By Kevin DuBois on 2016-01-27

 update changelog after 0.3 landing

Unmerged revisions

271. By Kevin DuBois on 2016-01-27

 update changelog after 0.3 landing

270. By Kevin DuBois on 2016-01-25

bump changelog for no change rebuild

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-21 17:43:12 +0000
+++ debian/changelog	2016-01-27 14:14:14 +0000
@@ -1,34 +1,74 @@
-unity-system-compositor (0.3.1+16.04.20160121-0ubuntu1) xenial; urgency=medium
-
-  [ Alexandros Frantzis ]
-  * Unblank the screen when a pointer or key event arrives. (LP: #1488413)
-
-  [ Andreas Pokorny ]
-  * Implement a DBus interface for setting pointer speed/acceleration.
-    (LP: #1536383)
-
- -- Alexandros Frantzis <[e-mail]>  Thu, 21 Jan 2016 19:27:33 +0200
-
-unity-system-compositor (0.2.0+16.04.20151222.1-0ubuntu1) xenial; urgency=medium
-
-  [ Alexandros Frantzis ]
-  * tests: Fix build failure with gcc-4.9
-
-  [ Andrea Cimitan ]
-  * Updated wallpaper for spinner from unity8.
-
-  [ Andreas Pokorny ]
-  * Add clone method to StubdisplayConfigurations
-  * Change keyboard handling to scan codes. (LP: #1514059, #1520422)
-  * do not premultiply RGB images
-  * follow the deprecation warning and use tobytes instead of tostring.
-
-  [ Kevin DuBois ]
-  * Accommodate RGB images (LP: #1528279)
-  * Accommodate RGB images (LP: #1528279)
-
- -- Kevin DuBois <[e-mail]>  Tue, 22 Dec 2015 19:09:40 +0000
-
+<<<<<<< TREE
+unity-system-compositor (0.3.1+16.04.20160121-0ubuntu1) xenial; urgency=medium
+
+  [ Alexandros Frantzis ]
+  * Unblank the screen when a pointer or key event arrives. (LP: #1488413)
+
+  [ Andreas Pokorny ]
+  * Implement a DBus interface for setting pointer speed/acceleration.
+    (LP: #1536383)
+
+ -- Alexandros Frantzis <[e-mail]>  Thu, 21 Jan 2016 19:27:33 +0200
+
+unity-system-compositor (0.2.0+16.04.20151222.1-0ubuntu1) xenial; urgency=medium
+
+  [ Alexandros Frantzis ]
+  * tests: Fix build failure with gcc-4.9
+
+  [ Andrea Cimitan ]
+  * Updated wallpaper for spinner from unity8.
+
+  [ Andreas Pokorny ]
+  * Add clone method to StubdisplayConfigurations
+  * Change keyboard handling to scan codes. (LP: #1514059, #1520422)
+  * do not premultiply RGB images
+  * follow the deprecation warning and use tobytes instead of tostring.
+
+  [ Kevin DuBois ]
+  * Accommodate RGB images (LP: #1528279)
+  * Accommodate RGB images (LP: #1528279)
+
+ -- Kevin DuBois <[e-mail]>  Tue, 22 Dec 2015 19:09:40 +0000
+
+=======
+unity-system-compositor (0.3.1+16.04.20160121-0ubuntu2) UNRELEASED; urgency=medium
+
+  * no change rebuild for mir 0.18.2
+
+ -- Kevin DuBois <[e-mail]>  Wed, 27 Jan 2016 09:12:35 -0500
+
+unity-system-compositor (0.3.1+16.04.20160121-0ubuntu1) xenial; urgency=medium
+
+  [ Alexandros Frantzis ]
+  * Unblank the screen when a pointer or key event arrives. (LP: #1488413)
+
+  [ Andreas Pokorny ]
+  * Implement a DBus interface for setting pointer speed/acceleration.
+    (LP: #1536383)
+
+ -- Alexandros Frantzis <[e-mail]>  Thu, 21 Jan 2016 19:27:33 +0200
+
+unity-system-compositor (0.2.0+16.04.20151222.1-0ubuntu1) xenial; urgency=medium
+
+  [ Alexandros Frantzis ]
+  * tests: Fix build failure with gcc-4.9
+
+  [ Andrea Cimitan ]
+  * Updated wallpaper for spinner from unity8.
+
+  [ Andreas Pokorny ]
+  * Add clone method to StubdisplayConfigurations
+  * Change keyboard handling to scan codes. (LP: #1514059, #1520422)
+  * do not premultiply RGB images
+  * follow the deprecation warning and use tobytes instead of tostring.
+
+  [ Kevin DuBois ]
+  * Accommodate RGB images (LP: #1528279)
+  * Accommodate RGB images (LP: #1528279)
+
+ -- Kevin DuBois <[e-mail]>  Tue, 22 Dec 2015 19:09:40 +0000
+
+>>>>>>> MERGE-SOURCE
 unity-system-compositor (0.2.0+16.04.20151216.1-0ubuntu1) xenial; urgency=medium
 
   [ Alexandros Frantzis ]