OSDN Git Service
(root)
/
mikumikustudio
/
libgdx-mikumikustudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
228bd28
296f5c7
)
Merged scene2d-new branch back into trunk.
author
nathan.sweet
<nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 2 Jul 2012 13:56:58 +0000
(13:56 +0000)
committer
nathan.sweet
<nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Mon, 2 Jul 2012 13:56:58 +0000
(13:56 +0000)
1
2
backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/GwtInput.java
patch
|
diff1
|
diff2
|
blob
|
history
gdx/src/com/badlogic/gdx/Version.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/GwtInput.java
Simple merge
diff --cc
gdx/src/com/badlogic/gdx/Version.java
index
4eca5da
,
beb8ffe
..
ade6660
---
1
/
gdx/src/com/badlogic/gdx/Version.java
---
2
/
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 */
\r
public class Version {
\r
/** the current version of libgdx in the major.minor format **/
\r
- public static String VERSION = "0.9.5";
\r
- public static String VERSION = "0.9.6";
\r
++ public static String VERSION = "0.9.7";
\r
}
\r
diff --cc
tests/gdx-tests/src/com/badlogic/gdx/tests/utils/GdxTests.java
Simple merge