summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
committerTravis Watkins <travis.watkins@linaro.org>2011-08-30 08:33:54 -0500
commit43c84a48550f71455582915c4881241a5e360ec2 (patch)
tree7c0c9cc0c281973694e61118d17840050c5a48b5 /VERSION
parent9fd0b94c600a451726e4b2124516afe3d32f13bc (diff)
parent5fbc293d6c63eb3e74f00ffa791b4f4abd3e10c2 (diff)
downloadmobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.gz
mobileperf-43c84a48550f71455582915c4881241a5e360ec2.tar.bz2
Merge branch 'master' into gles
Conflicts: src/plugin.cpp
Diffstat (limited to 'VERSION')
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 945baad..daad646 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.5.2
+0.9.5.94