summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-08-20 12:15:15 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-08-20 12:15:15 +0800
commita7f5dbb467b7aa35f49f7d824015fcf51193dfc8 (patch)
tree1500044f0c8d951aaab9d6b677dfd5fe978130be
parent1be316e96168110ff31abf415f4927cb2776f460 (diff)
parent126f2a2373c77d476969b70c3746bfc53963ea5d (diff)
downloadmobileperf-a7f5dbb467b7aa35f49f7d824015fcf51193dfc8.tar.gz
mobileperf-a7f5dbb467b7aa35f49f7d824015fcf51193dfc8.tar.bz2
Merge upstream
-rw-r--r--AUTHORS4
-rw-r--r--ChangeLog220
-rw-r--r--NEWS20
-rw-r--r--VERSION2
4 files changed, 233 insertions, 13 deletions
diff --git a/AUTHORS b/AUTHORS
index 2c25941..59abfdf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
Adam Williamson <awilliam@redhat.com>
Adel Gadllah <adel.gadllah@gmail.com>
Alyssa Hung <deciare@isisview.org>
+Andrea Azzarone <azzaronea@gmail.com>
Bellegarde Cedric <gnumdk@gmail.com>
Bellegarde Cedric <gnumdk@puffy.homelinux.org>
C-F Language team <i18n@opencompositing.org>
@@ -85,9 +86,12 @@ Steven Robertson <nihilismwow@gmail.com>
Stjepan Glavina <stjepang@gmail.com>
Søren Sandmann <sandmann@redhat.com>
Thierry Reding <thierry@gilfi.de>
+Tim Penhey <tim.penhey@canonical.com>
+Time Penhey <tim.penhey@canonical.com>
Tomas Carnecky <tom@dbservice.com>
Travis Watkins <amaranth@ubuntu.com>
Unity <unity@VB-U1010.(none)>
+Ville Syrjala <syrjala@sci.fi>
Zack Rusin <zack@kde.org>
dragoran <drago01@gmail.com>
gandalfn <gandalfn@club-internet.fr>
diff --git a/ChangeLog b/ChangeLog
index 41cf13c..78fa00c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,219 @@
+Merge: 8495379 825d16b
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Merge upstream
+
+Merge: 825d16b c9b0a19
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Merge in lp:~compiz-team/compiz-core/compiz-core.add_doc_for_decor
+
+Merge: 41f088c c12c848
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Merge lp:~compiz-team/compiz-core/compiz-core.distortion_fixes
+
+Merge: b0a1b5e 3504586
+Tim Penhey <tim.penhey@canonical.com> 2011-08-19
+
+ Merge lp:~thumper/compiz-core/fix-crash-on-event-source-cleanup
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Fix some other places we were using priv->attrib incorrectly
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Added comment explaining why we can't do that
+
+Merge: 01d92ab b0a1b5e
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Merge trunk
+
+Tim Penhey <tim.penhey@canonical.com> 2011-08-19
+
+ Don't have a wrapped CompEventSource as there is a bug in the destruction code.
+
+Tim Penhey <tim.penhey@canonical.com> 2011-08-19
+
+ Explicit constructors only make a difference when there is the ability to pass in a single argument.
+
+Tim Penhey <tim.penhey@canonical.com> 2011-08-19
+
+ Header now says to create an unwrapped event source.
+
+Tim Penhey <tim.penhey@canonical.com> 2011-08-19
+
+ Create an unwrapped CompEventSource.
+
+Merge: ab71bc8 9f4cdd6
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Merge
+
+Merge: 9f4cdd6 a8d1bcd
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-19
+
+ Merge in ICCCM 4.1.4 support
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-18
+
+ Correctly support ICCCM Section 4.1.4
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-13
+
+ Don't damage the paint rectangle in normal resize mode (fixed valgrind warning)
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-13
+
+ Use priv->geometry rather than priv->attrib, since priv->attrib could be updated by XGetWindowAttributes
+ which is a synchronous operation
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-13
+
+ Don't check against the XWindowAttributes that are stored when sending resize
+ notfications, since they could have been updated synchronously with XGetWindowAttributes
+ and could be out of sync with the geometry last received from the server which is what
+ we need to process requests based on.
+
+ Fixes cases where plugins didn't get that geometry update because of this condition,
+ which caused bugs like distorted windows in opengl since the window matrices were
+ wrong
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-12
+
+ memset the active window history so that we aren't jumping on unitialized garbage
+ in the array of windows
+
+Time Penhey <tim.penhey@canonical.com> 2011-08-12
+
+ Merge in flags change for dlopen () on debug builds (dlclosing () with valgrind
+ is a bit useless)
+
+Time Penhey <tim.penhey@canonical.com> 2011-08-12
+
+ Merge in source reset change
+
+Merge: 28cab1d e6cb461
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-12
+
+ Merge in GSettings CMake file change
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-10
+
+ Disable core-settings-schema too
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-10
+
+ Add option to disable GSettings schema generation
+
+Ville Syrjala <syrjala@sci.fi> 2011-08-02
+
+ [PATCH] Don't unredirect overlay windows until we have set the new
+ bounding shape for the output window.
+
+ Unredirecting them before this time meant that they were stacked
+ underneath the overlay window and changing the bounding shape of
+ the output window would cause an expose event to be sent to
+ the overlay window causing a breif flicker as it redraws.
+
+ Unredirecting after this means that no expose event is sent because
+ the backing store is only set again after the bounding shape of the
+ output window has been changed
+
+Merge: ceab806 f2b2dc4
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-29
+
+ Merge trunk
+
+Merge: f2b2dc4 c9b0a19
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-29
+
+ Merge in doc for decor
+
+Merge: 7347a7c 3bdb2ef
+Andrea Azzarone <azzaronea@gmail.com> 2011-07-28
+
+ Merge in lp:~andyrock/compiz-core/fix-1309
+
+Andrea Azzarone <azzaronea@gmail.com> 2011-07-27
+
+ If an argument to a strcmp function has an invalid value (null pointer, etc.) the behavior is undefined.
+
+Merge: 3264985 4217940
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-27
+
+ Merge
+
+Merge: a44844f 4bb1f70
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-27
+
+ Merge in gsettings schema generation
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-26
+
+ Use relocatable keys
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-26
+
+ Merge in gsettings schema generation
+
+Scott Moreau <oreaus@gmail.com> 2011-07-14
+
+ Merge in default value change for obs
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Fix typo, also add files that are being copied into staging
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Bump VERSION
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Update NEWS for 0.9.5.0
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Revert "Update NEWS for 0.9.5.0"
+
+ This reverts commit a6e2ea3adf61e57bdcd4c5c957ce8e7223a9fb0b.
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Revert "Bump VERSION"
+
+ This reverts commit bedeff5d74a2786dd2751fab9e48bf3f96b7790e.
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Revert "Update NEWS for 0.9.5.0"
+
+ This reverts commit f37eda58232743ce28eb780075c1a4b73545a209.
+
+Merge: 2804807 bedeff5
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Bump VERSION
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Update NEWS for 0.9.5.0
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Bump VERSION
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Update NEWS for 0.9.5.0
+
Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
Merge in build fix and debug message removal
@@ -204,6 +420,10 @@ Sam Spilsbury <sam.spilsbury@canonical.com> 2011-06-23
and unmapped windows or other docks when shuffling stacking to be below
fullscreen windows that are active
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-06-18
+
+ Add documentation for the decor plugin
+
Merge: 291627c 40849c0
Sam Spilsbury <sam.spilsbury@canonical.com> 2011-06-18
diff --git a/NEWS b/NEWS
index 7954280..b2f29d8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,9 @@
-Release 0.9.5.0 ( 2011-07-14 Sam Spilsbury <sam.spilsbury@canonical.com> )
-===========================================================================
-Development Release (0.9.5.0)
-
-Added new CMake commands to simplify releases
-
-Added unit tests
-
-Fixed a number of reparenting and stacking bugs
-
-Changed decoration interface. Now decorators can specify multiple decorations
-for a single window allowing compiz to cache decorations as needed
+Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <sam.spilsbury@canonical.com> )
+============================================================================
+Development Release (0.9.5.92)
+
+Added GSettings schema generation
+Revised libdecoration interface
+Fixed crashes on shutdown
+Don't unredirect overlay windows until they have been shaped
diff --git a/VERSION b/VERSION
index 945baad..daad646 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.5.2
+0.9.5.94