1
0
cuberite-2a/Android
Tycho 8133efd7f9 Merge branch 'chunksparsing/structs' into AllocationPool
Conflicts:
	src/ChunkData.cpp
	src/ChunkData.h
	tests/ChunkData/Coordinates.cpp
2014-05-25 18:02:33 +01:00
..
.settings Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
assets/basedir Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
gen/com/mcserver Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
jni Updated the android files 2014-03-29 12:24:26 +01:00
res Added the list_item.xml 2013-12-24 13:48:15 +01:00
src/com/mcserver Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
.classpath Merge branch 'chunksparsing/structs' into AllocationPool 2014-05-25 18:02:33 +01:00
.project Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
AndroidManifest.xml Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
proguard-project.txt Android: Moved Android stuff to the ~/trunk/Android/ folder! 2012-08-19 16:43:47 +00:00
project.properties Android: Moved Android stuff to the ~/trunk/Android/ folder! 2012-08-19 16:43:47 +00:00