Merge.
authorNicholas Hastings <skamonkey@gmail.com>
Wed Jul 25 08:38:11 2012 -0400 (2012-07-25)
changeset 3588fb1ad1323d75
parent 3587 03da25d025cc
parent 3586 e8537bc8c2e4
child 3589 3a310379e46c
Merge.
     1.1 --- a/plugins/include/version.inc	Wed Jul 25 08:31:01 2012 -0400
     1.2 +++ b/plugins/include/version.inc	Wed Jul 25 08:38:11 2012 -0400
     1.3 @@ -36,7 +36,7 @@
     1.4  #define _version_included
     1.5  
     1.6  #define SOURCEMOD_V_MAJOR		1				/**< SourceMod Major version */
     1.7 -#define SOURCEMOD_V_MINOR		4				/**< SourceMod Minor version */
     1.8 +#define SOURCEMOD_V_MINOR		5				/**< SourceMod Minor version */
     1.9  #define SOURCEMOD_V_RELEASE		0				/**< SourceMod Release version */
    1.10  
    1.11 -#define SOURCEMOD_VERSION	"1.4.0-dev"	/**< SourceMod version string (major.minor.release.build) */
    1.12 +#define SOURCEMOD_VERSION	"1.5.0-dev"	/**< SourceMod version string (major.minor.release.build) */