summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-08-20 12:27:55 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-08-20 12:27:55 +0800
commita13b43a5ce9dfd285c958e5789d6f5de861faa16 (patch)
treea2c4d4264db581454671a3136d6e949024a0df92
parente2aaf47f9eeaca8023ada1949032ebb1b73f0e39 (diff)
downloadmobileperf-a13b43a5ce9dfd285c958e5789d6f5de861faa16.tar.gz
mobileperf-a13b43a5ce9dfd285c958e5789d6f5de861faa16.tar.bz2
Update NEWS for 0.9.5.92.1
-rw-r--r--ChangeLog31
-rw-r--r--NEWS11
2 files changed, 35 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 78fa00c..dbeacce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Merge: 86bbd39 a7f5dbb
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Merge upstream
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Bump VERSION to reflect temporary release
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Fix stray .reset ()
+
+Merge: 1be316e 126f2a2
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Merge upstream
+
+Merge: 1852f86 1852f86
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Merge upstream
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Bump VERSION
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-20
+
+ Update NEWS for 0.9.5.92
+
Merge: 8495379 825d16b
Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
diff --git a/NEWS b/NEWS
index b2f29d8..ec7735b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,6 @@
-Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <sam.spilsbury@canonical.com> )
-============================================================================
-Development Release (0.9.5.92)
+Release 0.9.5.92.1 ( 2011-08-20 Sam Spilsbury <sam.spilsbury@canonical.com> )
+==============================================================================
+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