Update NEWS for 0.9.5.92.1

khurshid-alam · Aug 20, 2011 · d5b42b7 · d5b42b7
1 parent 4214a39
commit d5b42b7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,34 @@
+Merge: 86bbd39 a7f5dbb
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Merge upstream
+
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Bump VERSION to reflect temporary release
+
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Fix stray .reset ()
+
+Merge: 1be316e 126f2a2
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Merge upstream
+
+Merge: 1852f86 1852f86
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Merge upstream
+
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Bump VERSION
+
+Sam Spilsbury <[email protected]>	2011-08-20
+
+    Update NEWS for 0.9.5.92
+
 Merge: 8495379 825d16b
 Sam Spilsbury <[email protected]>	2011-08-19
 

diff --git a/NEWS b/NEWS
@@ -1,9 +1,6 @@
-Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <[email protected]> ) 
-============================================================================
-Development Release (0.9.5.92)
+Release 0.9.5.92.1 ( 2011-08-20 Sam Spilsbury <[email protected]> ) 
+==============================================================================
+Release (0.9.5.92.1)
 
-Added GSettings schema generation
-Revised libdecoration interface
-Fixed crashes on shutdown
-Don't unredirect overlay windows until they have been shaped
+Fix failure to build from source due to merge failure on the last release