projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31a5342 291a5c9)
Merge remote branch 'gvdb/master'
authorRyan Lortie <desrt@desrt.ca>
Wed, 21 Apr 2010 00:13:56 +0000 (20:13 -0400)
committerRyan Lortie <desrt@desrt.ca>
Wed, 21 Apr 2010 00:13:56 +0000 (20:13 -0400)
1  2 
gio/gvdb/gvdb-format.h patch | diff1 | diff2 | blob | history

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