[Branch,~glmark2-dev/glmark2/trunk] Rev 192: Build, Doc: Update files for 2012.01 release.

=== modified file 'NEWS'
--- NEWS	2011-12-15 13:52:04 +0000
+++ NEWS	2012-01-19 18:13:38 +0000
@@ -1,3 +1,19 @@ 
+glmark2 2012.01 (20120119)
+==========================
+
+* X11:
+  - Run each benchmark in a fresh GL context. Use --reuse-context
+    to revert to the old default behavior of using the same context
+    for all benchmarks.
+  - Add option for showing a live FPS counter on screen (--show-fps).
+  - If the list of benchmarks to run contains only option-setting
+    descriptions, run the default benchmarks.
+* Android:
+  - Fix crash on platforms not supporting glMapBufferOES.
+  - Log the glmark2 score when finishing.
+  - Log an error message if we fail to find a suitable EGLContext.
+  - Implement various stability improvements.
+
 glmark2 2011.12 (20111215)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2011-12-15 13:52:04 +0000
+++ android/AndroidManifest.xml	2012-01-19 18:13:38 +0000
@@ -1,7 +1,7 @@ 
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       android:versionCode="1"
-      android:versionName="2011.12" package="org.linaro.glmark2">
+      android:versionName="2012.01" package="org.linaro.glmark2">
     <application android:label="@string/app_name">
         <activity android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

=== modified file 'android/jni/Android.mk'
--- android/jni/Android.mk	2011-12-15 13:52:04 +0000
+++ android/jni/Android.mk	2012-01-19 18:13:38 +0000
@@ -27,7 +27,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.12\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\""
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	2011-12-15 13:52:04 +0000
+++ android/jni/Android.ndk.mk	2012-01-19 18:13:38 +0000
@@ -23,7 +23,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.12\""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\""
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2012-01-18 17:13:28 +0000
+++ doc/glmark2.1.in	2012-01-19 18:13:38 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "December 2011" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "January 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2011-12-15 13:52:04 +0000
+++ wscript	2012-01-19 18:13:38 +0000
@@ -8,7 +8,7 @@ 
 out = 'build'
 top = '.'
 
-VERSION = '2011.12'
+VERSION = '2012.01'
 APPNAME = 'glmark2'
 
 def options(opt):