projects / platform / upstream / glib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 43254e8) | patch
Forgotten part of an earlier mismerge
authorMatthias Clasen <mclasen@redhat.com>
Wed, 21 Sep 2011 19:46:24 +0000 (15:46 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 21 Sep 2011 19:47:26 +0000 (15:47 -0400)
commitc6f84faa17227da437eeceb58ce79334ffdfdb57
treea463c15923d9a934afa968acd765453571bdeeedtree | snapshot
parent43254e8c4c60f102be1212a1919953ad7ddf31dbcommit | diff
Forgotten part of an earlier mismerge

This is making gmappedfile.c identical to the glib-2-30 branch again.
glib/gmappedfile.c diff | blob | history
Domain: System / Base;