pidgin.2.x.y: bdf71665: Changes for 2.10.5

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: bdf716656fe9b6b5758355a8c1d1689a9ea9f2d7
Parent:   03f3e779309e683d092706d76a5253c6794d3a66
Author:   markdoliner at pidgin.im
Date:     05/07/12 00:03:38
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/bdf716656fe9b6b5758355a8c1d1689a9ea9f2d7

Changelog: 

Changes for 2.10.5

Changes against parent 03f3e779309e683d092706d76a5253c6794d3a66

  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  po/ChangeLog

-------------- next part --------------
============================================================
--- ChangeLog	94f96063e641e1f5249ad36fcbb48b8949b51add
+++ ChangeLog	2d3c5c9e6b83991498441e6ef524b2d2a16080d8
@@ -1,5 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.5:
+	No changes
+
 version 2.10.4 (05/06/2012):
 	General:
 	* Support building against Farstream in addition to Farsight.
============================================================
--- configure.ac	f745dac9118aee975feba1c98f13de760f57eff0
+++ configure.ac	6ac2f0ef296c6d521e512d2ca523d812b7e834a3
@@ -46,8 +46,8 @@ m4_define([purple_minor_version], [10])
 m4_define([purple_lt_current], [10])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [10])
-m4_define([purple_micro_version], [4])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [5])
+m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
============================================================
--- po/ChangeLog	19c6034438d4c0a73d85f2644950d39cedbeaa09
+++ po/ChangeLog	0a6a39e8ff25ed7346b2f20597b31ee9192a8dcf
@@ -1,5 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.5
+	* No changes
+
 version 2.10.4
 	* German translation updated (Bj?rn Voigt, Jochen Kemnade)
 
============================================================
--- ChangeLog.API	a59247691deece46a997c66a724c46c439587c28
+++ ChangeLog.API	9d55abbb9a96631178123035376ad2e733f8fd53
@@ -1,5 +1,8 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.5:
+	* No changes
+
 version 2.10.4:
 	* No changes