/pidgin/main: 36d51c98dd7b: Ugh, forgot to changelog before push...

[John Bailey]

Changeset: 36d51c98dd7b83928dd4e16be463eaa632080b7b
Author:	 John Bailey <rekkanoryo at rekkanoryo.org>
Date:	 2012-12-01 17:20 -0500
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/36d51c98dd7b

Description:

Ugh, forgot to changelog before pushing.  Refs #15316.

diffstat:

 ChangeLog |  5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diffs (15 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ version 2.10.7:
 	Alien hatchery:
 	* No changes
 
+	General:
+	* The configure script will now exit with status 1 when specifying
+	  invalid protocol plugins using the --with-static-prpls and
+	  --with-dynamic-prpls arguments. (Michael Fiedler) (#15316)
+
 	libpurple:
 	* Don't link directly to libgcrypt when building with GnuTLS support.
 	  (Bartosz Brachaczek) (#15329)