From: nathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Date: Mon, 2 Jul 2012 13:56:58 +0000 (+0000)
Subject: Merged scene2d-new branch back into trunk.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6ff1cb5fe2f755f5801c3ce80b9078e0d60519f;p=mikumikustudio%2Flibgdx-mikumikustudio.git

Merged scene2d-new branch back into trunk.
---

c6ff1cb5fe2f755f5801c3ce80b9078e0d60519f
diff --cc gdx/src/com/badlogic/gdx/Version.java
index 4eca5da0e,beb8ffef9..ade6660cb
--- a/gdx/src/com/badlogic/gdx/Version.java
+++ b/gdx/src/com/badlogic/gdx/Version.java
@@@ -21,5 -21,5 +21,5 @@@ package com.badlogic.gdx
   * @author mzechner */
  public class Version {
  	/** the current version of libgdx in the major.minor format **/
- 	public static String VERSION = "0.9.5";
 -	public static String VERSION = "0.9.6";
++	public static String VERSION = "0.9.7";
  }