Merge from 1.2 branch.

This commit is contained in:
Scott Ehlert
2009-03-05 15:48:38 -06:00
19 changed files with 56 additions and 17 deletions
+1 -1
View File
@@ -36,7 +36,7 @@
#ifndef _INCLUDE_GEOIP_VERSION_H_
#define _INCLUDE_GEOIP_VERSION_H_
#define SM_BUILD_STRING ""
#define SM_BUILD_STRING "-dev"
#define SM_BUILD_UNIQUEID "2650:5d34bc3edbfa" SM_BUILD_STRING
#define SVN_FULL_VERSION "1.3.0" SM_BUILD_STRING
#define SVN_FILE_VERSION 1,3,0,0