flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'chunksparsing/structs' into AllocationPool

Browse Source 
Conflicts:
	src/ChunkData.cpp
	src/ChunkData.h
	tests/ChunkData/Coordinates.cpp
This commit is contained in:
Tycho
2014-05-25 18:02:33 +01:00
parent 2591087385 944d29c0ae
commit 8133efd7f9
89 changed files with 2713 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android/.classpath
View File

@@ -3,6 +3,7 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>