[glibmm/glibmm-2-20-mm-common: 167/179] Merge commit '4a7e27629523826d36565bff459c323573b87668' into glibmm-2-20-mm-common
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-20-mm-common: 167/179] Merge commit '4a7e27629523826d36565bff459c323573b87668' into glibmm-2-20-mm-common
- Date: Sat, 5 Sep 2009 12:38:30 +0000 (UTC)
commit b89b25029f2a4a48c2bdb47e770eee05314a524d
Merge: fa2ae6f... 4a7e276...
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sat Sep 5 10:55:04 2009 +0200
Merge commit '4a7e27629523826d36565bff459c323573b87668' into glibmm-2-20-mm-common
ChangeLog | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc ChangeLog
index 4e0bdf0,5631a40..daed459
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,38 +1,11 @@@
+ 2009-07-17 David King <davidk openismus com>
+
+ * examples/properties/properties_example.cc: Only compile the
+ properties example if properties are enabled.
+
-2009-07-16 Jonathon Jongsma <jonathon jongsma collabora co uk>
-
- * .gitignore:
- * configure.ac:
- * examples/Makefile.am:
- * examples/network_io/Makefile.am:
- * examples/network_io/resolve.cc: Added a simple example showing how
- to resolve an internet address from a hostname
-
-2009-07-16 Jonathon Jongsma <jonathon jongsma collabora co uk>
-
- * gio/src/resolver.ccg:
- * gio/src/resolver.hg: add async versions of Resolver methods
-
-2009-07-16 Jonathon Jongsma <jonathon jongsma collabora co uk>
-
- * gio/src/resolver.ccg:
- * gio/src/resolver.hg: add overloads for resolver methods without a
- cancellable object
-
-2009-07-16 Jonathon Jongsma <jonathon jongsma collabora co uk>
-
- * gio/src/drive.hg:
- * tools/m4/convert_gio.m4: add get_start_stop_type() and
- Gio::DriveStartStopType enum
-
-2009-07-16 Jonathon Jongsma <jonathon jongsma collabora co uk>
+2009-07-13 Jonathon Jongsma <jonathon quotidian org>
- * gio/src/drive.hg: add _IGNORE() for a eject_with_operation() which
- is hand-written
+ * Makefile.am: fix release targets since we switched to git
2009-07-14 Jonathon Jongsma <jonathon quotidian org>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]