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:
95910ef
36e6902
)
Merge branch 'master' of https://github.com/libgdx/libgdx into 3dapi
author
Xoppa
<contact@xoppa.nl>
Fri, 24 May 2013 16:26:14 +0000
(18:26 +0200)
committer
Xoppa
<contact@xoppa.nl>
Fri, 24 May 2013 16:26:14 +0000
(18:26 +0200)
1
2
gdx/src/com/badlogic/gdx/graphics/g3d/Renderable.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
gdx/src/com/badlogic/gdx/graphics/g3d/Renderable.java
Simple merge