Merge branch 'master' into vp

This commit is contained in:
Eric Wasylishen 2014-10-24 14:13:19 -06:00
commit d6e3de70ed
3 changed files with 2 additions and 2 deletions

View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.90.0</string>
<string>0.90.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>LSApplicationCategoryType</key>

View file

@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define FITZQUAKE_VERSION 0.85 //johnfitz
#define QUAKESPASM_VERSION 0.90
#define QUAKESPASM_VER_PATCH 0 // helper to print a string like 0.90.0
#define QUAKESPASM_VER_PATCH 1 // helper to print a string like 0.90.0
//define PARANOID // speed sapping error checking