tag | 9ba23cdf3246e141a1c7b43f8fe978ad4c17dea5 | |
---|---|---|
tagger | Matthias Clasen <mclasen@redhat.com> | Thu Jun 17 19:41:56 2010 -0400 |
object | 7b1f45c2e8b5f3ba3595c5cf74fbfc70f03b61c0 |
GLib 2.25.9
commit | 7b1f45c2e8b5f3ba3595c5cf74fbfc70f03b61c0 | [log] [tgz] |
---|---|---|
author | Matthias Clasen <mclasen@redhat.com> | Thu Jun 17 19:08:13 2010 -0400 |
committer | Matthias Clasen <mclasen@redhat.com> | Thu Jun 17 19:08:52 2010 -0400 |
tree | a73df8468b2efebc47352f4e05fda6f52c374cfe | |
parent | 9b59059d9e85d10406393cef08e432626dcc78da [diff] |
Fix a mismerge