Merge from 2.4:

2004-05-10  Matthias Clasen  <mclasen@redhat.com>

	Merge from 2.4:

	* glib/gmain.c (block_source, unblock_source): Make these
	static.  (#142230, Morten Welinder)
This commit is contained in:
Matthias Clasen
2004-05-10 19:21:28 +00:00
committed by Matthias Clasen
parent b5456a91d7
commit 185c1de577
6 changed files with 37 additions and 2 deletions

View File

@@ -1,3 +1,10 @@
2004-05-10 Matthias Clasen <mclasen@redhat.com>
Merge from 2.4:
* glib/gmain.c (block_source, unblock_source): Make these
static. (#142230, Morten Welinder)
2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated