← Back to branch summary

~glmark2-dev/glmark2/live-fps-context

~glmark2-dev/glmark2/live-fps-context

Viewing all changes in revision 179.

Committer: Alexandros Frantzis
Date: 2012-01-03 18:54:16 UTC
mfrom: (175.1.8 context)
Revision ID: alexandros.frantzis@linaro.org-20120103185416-vva2n9jfuiwgpmr1

Merge context branch.

files added:
src/context.cpp

src/context.h

files modified:
NEWS

android/AndroidManifest.xml

android/jni/Android.mk

android/jni/Android.ndk.mk

doc/glmark2.1.in

src/canvas-android.cpp

src/canvas-android.h

src/canvas-x11-egl.cpp

src/canvas-x11-egl.h

src/canvas-x11-glx.cpp

src/canvas-x11-glx.h

src/canvas.h

src/shader-source.cpp

wscript

Show diffs side-by-side

added added

removed removed

android/AndroidManifest.xml

android/jni/Android.mk

android/jni/Android.ndk.mk

doc/glmark2.1.in

src/canvas-android.cpp

src/canvas-android.h

src/canvas-x11-egl.cpp

src/canvas-x11-egl.h

src/canvas-x11-glx.cpp

src/canvas-x11-glx.h

src/context.cpp

src/shader-source.cpp

Older »