luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed a conflict delimiter (">>>>>>> .r5422")

Browse Source 
svn path=/trunk/; revision=5424
This commit is contained in:
Marco Barisione 2007-03-17 14:01:24 +00:00
parent 770b29bad2
commit 2920c533b8
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -66,7 +66,6 @@ Fri Mar 16 11:24:51 2007 Tim Janik <timj@imendio.com>
* glib/gscanner.c (g_scanner_get_token_ll): Fix a typo
in the last commit. (#415323, Richard Hult)
>>>>>>> .r5422
2007-03-15 Tor Lillqvist <tml@novell.com>
* glib/gnulib/Makefile.am (INCLUDES): Add -I$(top_srcdir)/glib so