From adf3449e69926e23957cf5b786c4f049e6aa068d Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Sat, 18 Apr 2015 15:53:35 -0500
Subject: merge some changes from the old "gpp" branch: edit version tags and
 the set the default fs_game to "gpp"

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index eff1a6b1..42814787 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ endif
 export CROSS_COMPILING
 
 ifndef VERSION
-VERSION=1.2.0
+VERSION=gpp1
 endif
 
 ifndef CLIENTBIN
-- 
cgit