OSDN Git Service

Merge branch 'master' into httpimplementation
authorAriel Coppes <ariel.coppes@gemserk.com>
Thu, 10 Jan 2013 23:00:25 +0000 (21:00 -0200)
committerAriel Coppes <ariel.coppes@gemserk.com>
Thu, 10 Jan 2013 23:00:25 +0000 (21:00 -0200)
commite4b9f6a15abc48376f76dd6aef44235d5e9931c2
treef867c9f6b695efafeaddd309f4eb3e3260a7a0c8
parente793358474385d601f7046ae3bbfda85b8ad0850
parentbc2bd7ae201197b5b773df0e59d3b1ff85ee7f39
Merge branch 'master' into httpimplementation

Conflicts:
backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/GwtNet.java
backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/GwtNet.java