Merging loads of stuff from mainline.

1 files changed, 3 insertions, 1 deletions

diff --git a/bitlbee.h b/bitlbee.h
index 24d09e2e..1828554a 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -34,8 +34,10 @@
 #define _WIN32_WINNT 0x0501
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.5"
+#define BITLBEE_VERSION "1.2.6"
 #define VERSION BITLBEE_VERSION
+#define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+#define BITLBEE_VERSION_CODE BITLBEE_VER(1, 2, 6)
 
 #define MAX_STRING 511