projects / platform / upstream / glib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4b06cf6) | patch
Remove leftover svn conflict indicator.
authorTor Lillqvist <tml@src.gnome.org>
Sun, 18 May 2008 19:46:49 +0000 (19:46 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Sun, 18 May 2008 19:46:49 +0000 (19:46 +0000)
commit78bdc9397b8b63b9dc3a8ed4e62845442cb859ae
tree361103c8e019d60a064e5df32a075045c308ab5etree | snapshot
parent4b06cf6ce9f8c25be43895612b96674445a6442fcommit | diff
Remove leftover svn conflict indicator.

svn path=/trunk/; revision=6908
ChangeLog diff | blob | history
Domain: System / Base;