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

=== modified file 'NEWS'
--- NEWS	2012-01-19 18:13:38 +0000
+++ NEWS	2012-02-16 11:45:12 +0000
@@ -1,3 +1,19 @@ 
+glmark2 2012.02 (20120216)
+==========================
+
+* Consolidate X11 and Android main loops.
+* Accept command-line options on Android through either a file
+  ('/data/glmark2/args') or an extra intent key ('args').
+* Support per-scene options for displaying an FPS count on screen
+  (show-fps, fps-pos, fps-size), and remove --show-fps command-line option.
+* Support per-scene options for displaying a benchmark title on screen
+  (title, title-pos, title-size).
+* Add command-line option to run benchmarks indefinitely (--run-forever).
+* Add command-line option to annotate the benchmarks with on-screen
+  information (--annotate == -b :show-fps=true:title=#info#).
+* Move various utility classes to libmatrix.
+* Fix build issues on Android ICS.
+
 glmark2 2012.01 (20120119)
 ==========================
 

=== modified file 'android/AndroidManifest.xml'
--- android/AndroidManifest.xml	2012-01-19 18:13:38 +0000
+++ android/AndroidManifest.xml	2012-02-16 11:45:12 +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="2012.01" package="org.linaro.glmark2">
+      android:versionName="2012.02" 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	2012-02-13 10:05:30 +0000
+++ android/jni/Android.mk	2012-02-16 11:45:12 +0000
@@ -26,7 +26,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.02\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \

=== modified file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	2012-02-13 10:05:30 +0000
+++ android/jni/Android.ndk.mk	2012-02-16 11:45:12 +0000
@@ -22,7 +22,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\"" \
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.02\"" \
                 -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \

=== modified file 'doc/glmark2.1.in'
--- doc/glmark2.1.in	2012-02-16 09:07:16 +0000
+++ doc/glmark2.1.in	2012-02-16 11:45:12 +0000
@@ -1,4 +1,4 @@ 
-.TH @APPNAME@ "1" "January 2012" "@appname@ @appversion@"
+.TH @APPNAME@ "1" "February 2012" "@appname@ @appversion@"
 .SH NAME
 @appname@ \- OpenGL (ES) 2.0 benchmark suite
 .SH SYNOPSIS

=== modified file 'wscript'
--- wscript	2012-02-13 10:05:30 +0000
+++ wscript	2012-02-16 11:45:12 +0000
@@ -8,7 +8,7 @@ 
 out = 'build'
 top = '.'
 
-VERSION = '2012.01'
+VERSION = '2012.02'
 APPNAME = 'glmark2'
 
 def options(opt):