summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.API3
-rw-r--r--ChangeLog.win323
-rw-r--r--NEWS5
-rw-r--r--configure.ac4
5 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 785f1825d1..17bd583b55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+version 2.6.1 (08/18/2009):
+ * Fix a crash when some users send you a link in a Yahoo IM
+ * Fix compilation with GTK+ < 2.6.0
+ * Fix compilation on Windows
+
version 2.6.0 (08/18/2009):
libpurple:
* Theme support in libpurple thanks to Justin Rodriguez's summer of code
diff --git a/ChangeLog.API b/ChangeLog.API
index aefadc0b5a..89b533fc9e 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,5 +1,8 @@
Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
+version 2.6.1 (08/18/2009):
+ No changes
+
version 2.6.0 (08/18/2009):
libpurple:
Added:
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index 89518ec1bb..fbbd1f1aae 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,3 +1,6 @@
+version 2.6.1 (08/18/2009):
+ * No changes
+
version 2.6.0 (08/18/2009):
* Added XMPP URI support.
diff --git a/NEWS b/NEWS
index 396a3751e2..b55fc70c91 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
Our development blog is available at: http://planet.pidgin.im
+2.6.1 (08/18/2009):
+ Mark: There were a lot of changes in 2.6.0, and so a few major bugs
+ crept in. This is a very minor release to fix those bugs. Sorry for
+ the inconvenience!
+
2.6.0 (08/18/2009):
John: Wow, four straight releases that I'm the first to NEWS on. This
is getting kinda scary! I'm beginning to wonder who else actually does
diff --git a/configure.ac b/configure.ac
index 73b1cda751..4d565673f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_PREREQ([2.50])
m4_define([purple_lt_current], [6])
m4_define([purple_major_version], [2])
m4_define([purple_minor_version], [6])
-m4_define([purple_micro_version], [0])
+m4_define([purple_micro_version], [1])
m4_define([purple_version_suffix], [])
m4_define([purple_version],
[purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@ m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suf
m4_define([gnt_lt_current], [6])
m4_define([gnt_major_version], [2])
m4_define([gnt_minor_version], [6])
-m4_define([gnt_micro_version], [0])
+m4_define([gnt_micro_version], [1])
m4_define([gnt_version_suffix], [])
m4_define([gnt_version],
[gnt_major_version.gnt_minor_version.gnt_micro_version])