projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
770b29b
)
Removed a conflict delimiter (">>>>>>> .r5422")
author
Marco Barisione
<mbari@src.gnome.org>
Sat, 17 Mar 2007 14:01:24 +0000
(14:01 +0000)
committer
Marco Barisione
<mbari@src.gnome.org>
Sat, 17 Mar 2007 14:01:24 +0000
(14:01 +0000)
svn path=/trunk/; revision=5424
ChangeLog
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
abadb95
..
99e3fe9
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-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