Merge from 2.4:
authorMatthias Clasen <maclas@gmx.de>
Sun, 9 May 2004 03:08:19 +0000 (03:08 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Sun, 9 May 2004 03:08:19 +0000 (03:08 +0000)
commit1d4458c4484a28fcb1e2eda2e4b85c4f38066d41
tree16d5640ad436e53b65058fcea2fa3482cdcbecc3
parentb745e58abce293d65bad64e6ec39e1afda5ec543
Merge from 2.4:

Sat May  8 23:02:26 2004  Matthias Clasen  <maclas@gmx.de>

Merge from 2.4:

* glib/gutils.h: Remove vestigial g_get_codeset().
* glib/gutils.c (g_get_codeset): Call g_get_charset().
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-12
ChangeLog.pre-2-6
ChangeLog.pre-2-8
glib/gutils.c
glib/gutils.h