# HG changeset patch
# User Nicholas Hastings <skamonkey@gmail.com>
# Date 1343219891 14400
# Node ID fb1ad1323d757c9578d30bb68609800975b4b53c
# Parent  03da25d025cc7b9eb72012eb67a18c05dc80b48c# Parent  e8537bc8c2e455e60358f5d3b142cd7540091137
Merge.

diff -r 03da25d025cc -r fb1ad1323d75 plugins/include/version.inc
--- a/plugins/include/version.inc	Wed Jul 25 08:31:01 2012 -0400
+++ b/plugins/include/version.inc	Wed Jul 25 08:38:11 2012 -0400
@@ -36,7 +36,7 @@
 #define _version_included
 
 #define SOURCEMOD_V_MAJOR		1				/**< SourceMod Major version */
-#define SOURCEMOD_V_MINOR		4				/**< SourceMod Minor version */
+#define SOURCEMOD_V_MINOR		5				/**< SourceMod Minor version */
 #define SOURCEMOD_V_RELEASE		0				/**< SourceMod Release version */
 
-#define SOURCEMOD_VERSION	"1.4.0-dev"	/**< SourceMod version string (major.minor.release.build) */
+#define SOURCEMOD_VERSION	"1.5.0-dev"	/**< SourceMod version string (major.minor.release.build) */