projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ef4554 73acf01)
Merge remote-tracking branch 'gvdb/master'
authorAlexander Larsson <alexl@redhat.com>
Fri, 13 Jan 2012 15:12:56 +0000 (16:12 +0100)
committerAlexander Larsson <alexl@redhat.com>
Fri, 13 Jan 2012 15:12:56 +0000 (16:12 +0100)
1  2 
gio/gvdb/gvdb-reader.c patch | diff1 | diff2 | blob | history
gio/gvdb/gvdb-reader.h patch | diff1 | diff2 | blob | history

diff --cc gio/gvdb/gvdb-reader.c
Simple merge
diff --cc gio/gvdb/gvdb-reader.h
Simple merge
Domain: System / Base;