# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1069824466 0
# Node ID eeb54a5400201d599513104af0697f8cddcc5efa
# Parent  6c2115a8564e23aa03a259859b71028b943a1f08
[gaim-migrate @ 8275]
Since I seem to be the one who feels the CVS funk, here's the (massively
trivial) merge from 0.74 back into the mainline.  Boy would I like to be
feeling the OpenCM funk.  "opencm.gaim.sf.net" just has a ring to it, I
think...  Oh, and this opens up 0.75cvs.

committer: Tailor Script <tailor@pidgin.im>

diff -r 6c2115a8564e -r eeb54a540020 ChangeLog
--- a/ChangeLog	Tue Nov 25 23:21:31 2003 +0000
+++ b/ChangeLog	Wed Nov 26 05:27:46 2003 +0000
@@ -1,6 +1,11 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
-version 0.74cvs
+version 0.75cvs :
+
+version 0.74 (11/25/2003):
+	* Sort-by-size log sorting fix
+	* Log directory umask fix for users of gaim-remote
+	* Fix Jabber room creation on MUC servers.
 	* Vietnamese translation added (T.M.Thanh,M.D.)
 
 version 0.73 (11/21/2003):
diff -r 6c2115a8564e -r eeb54a540020 NEWS
--- a/NEWS	Tue Nov 25 23:21:31 2003 +0000
+++ b/NEWS	Wed Nov 26 05:27:46 2003 +0000
@@ -1,4 +1,18 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
+0.74 (11/25/2003):
+	Sean: Christian and Nathan were wrong.
+
+	Ethan: I don't know how solid or good this release will be, but
+	hopefully it's better than 0.73!  Not that 0.73 didn't rock or
+	anything, but for those users bit by its peculiar little bugs
+	it wasn't as nice as this will be.
+
+	Nathan: Jabber got some good tweaks, and logging doesn't eat
+	memory until the cows come home.  Which is good, because they
+	said they'll be out until late.
+
+	Luke: Always nice when directories get created correctly ;-)
+
 0.73 (11/21/2003):
 	Nathan: This should be a really solid release.  I fixed most if not
 	all of the idiotic Jabber bugs from 0.72, and re-enabled the SASL
diff -r 6c2115a8564e -r eeb54a540020 VERSION
--- a/VERSION	Tue Nov 25 23:21:31 2003 +0000
+++ b/VERSION	Wed Nov 26 05:27:46 2003 +0000
@@ -1,1 +1,1 @@
-0.74cvs
+0.75cvs
diff -r 6c2115a8564e -r eeb54a540020 configure.ac
--- a/configure.ac	Tue Nov 25 23:21:31 2003 +0000
+++ b/configure.ac	Wed Nov 26 05:27:46 2003 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/main.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.74cvs])
+AM_INIT_AUTOMAKE([gaim], [0.75cvs])
 
 AC_PREREQ([2.50])