Merge remote-tracking branch 'origin/master'

author NathanSweet <nathan.sweet@gmail.com>

Sun, 3 Mar 2013 22:37:11 +0000 (23:37 +0100)

committer NathanSweet <nathan.sweet@gmail.com>

Sun, 3 Mar 2013 22:37:11 +0000 (23:37 +0100)
author NathanSweet <nathan.sweet@gmail.com>
Sun, 3 Mar 2013 22:37:11 +0000 (23:37 +0100)
committer NathanSweet <nathan.sweet@gmail.com>
Sun, 3 Mar 2013 22:37:11 +0000 (23:37 +0100)
diff --cc backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglApplication.java
Simple merge
diff --cc backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglCanvas.java
Simple merge
diff --cc gdx/src/com/badlogic/gdx.gwt.xml
Simple merge
author	NathanSweet <nathan.sweet@gmail.com>
	Sun, 3 Mar 2013 22:37:11 +0000 (23:37 +0100)
committer	NathanSweet <nathan.sweet@gmail.com>
	Sun, 3 Mar 2013 22:37:11 +0000 (23:37 +0100)
		1	2
backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglApplication.java	patch \|	diff1 \|	diff2 \|	blob \| history
backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglCanvas.java	patch \|	diff1 \|	diff2 \|	blob \| history
gdx/src/com/badlogic/gdx.gwt.xml	patch \|	diff1 \|	diff2 \|	blob \| history