[merged from stable]
authorTim Janik <timj@gtk.org>
Fri, 17 May 2002 22:49:06 +0000 (22:49 +0000)
committerTim Janik <timj@src.gnome.org>
Fri, 17 May 2002 22:49:06 +0000 (22:49 +0000)
commit7aebfd424f9eb49b9926ac6c2f06d6b3a8381331
tree84ad6ac5e8b42d48006a5b0993464bd13b30bb70
parentd8ea5db966d300d416c1c616b0a4e5808a2ea616
[merged from stable]

Sat May 18 00:44:35 2002  Tim Janik  <timj@gtk.org>

        [merged from stable]

        * glib/tmpl/scanner.sgml: fix documentation for g_scanner_unexp_token().
docs/reference/ChangeLog
docs/reference/glib/tmpl/scanner.sgml