projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2553511 a5dd6fc)
Merge remote-tracking branch 'gvdb/master'
authorRyan Lortie <desrt@desrt.ca>
Fri, 15 Apr 2011 13:29:47 +0000 (09:29 -0400)
committerRyan Lortie <desrt@desrt.ca>
Fri, 15 Apr 2011 13:29:47 +0000 (09:29 -0400)
1  2 
gio/gvdb/gvdb-builder.c patch | diff1 | diff2 | blob | history

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