Merge from 2.4:
authorMatthias Clasen <mclasen@redhat.com>
Mon, 10 May 2004 19:21:28 +0000 (19:21 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Mon, 10 May 2004 19:21:28 +0000 (19:21 +0000)
commit185c1de57776dc6cc2c5447692d68acd58d8a941
tree2780b8c777e906b0a78ca809a741ae6801c58d26
parentb5456a91d7dc4afd29024b8cf00f0911a961910a
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)
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-12
ChangeLog.pre-2-6
ChangeLog.pre-2-8
glib/gmain.c