summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog153
1 files changed, 153 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fde4aa2..eda6d6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,160 @@
+Merge: def76ce 7c4cee7
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-08-02
+
+ [merge] Upstream git
+
+smspillaz <smspillaz@opencompositing.org> 2011-08-01
+
+ Dummy commit
+
+Merge: c4f7079 505d474
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-29
+
+ Merge in settings upgrade work
+
+Merge: 22472ec a09ce39
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-27
+
+ Merge runtime fix
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-26
+
+ Typo in writeOption ...
+
+Merge: 4f02cdf 330c8df
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-26
+
+ Merge in gsettings port
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-24
+
+ API Update
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-21
+
+ Fix referencing madness
+
+Merge: 4f02cdf 12e2674
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Merge in port to GSettings
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Replace by a #define where appropriate
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Remove an ugly #define
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Move strings describing schema id's and paths to #define's
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Coding style .. change foo_bar to camelCase
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Make it a compile time option
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Moved all the GConf integration support into a separate file
+ keep the USE_GCONF markers
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Remove more rogue GConf and wrap all the legacy gconf integration stuff
+ in #ifdef's
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Remove GConfisms from parts of the code which are purely GSettings and fix warnings
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Remove GConfEngine usage as we're not copying keys around anymore
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Re enable integrated options writing for now ... the only settings we really
+ integrate with right now are metacity so just use gconf for that
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Update copyright
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Change notification is working
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Memleak
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Add the gsettings schema for compizconfig-python
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Profile deletion works in theory, though it seems like gsettings isn't
+ actually unsetting the keys right now
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Profile switching support added
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-15
+
+ Initial support for profiles
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Use relocatable schemas and remove some commented gconf items
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-14
+
+ Basic setting/reading writing from dconf now working, don't write to
+ gconf anymore
+
+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-13
Added some extended debugging info when failing to read keys
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-11
+
+ Basic option value read/write working. Fix assertion failure because
+ we copied one too many characters on the key string
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-11
+
+ Disable writing to integrated options for now
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-11
+
+ Temporarily disable profile support and create a GSettings object
+ for each unique plugin schema during read/write operations
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-11
+
+ Write to an overlay on gconf, cleanup the key names so they are in
+ line with the generated schemas
+
+Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-10
+
+ Start the transition to GSettings, use the gconf backend for now
+
Sam Spilsbury <sam.spilsbury@canonical.com> 2011-07-07
Add new release commands