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

Merge remote-tracking branch 'origin/master' into c++11

Browse Source 
Conflicts:
	src/Noise/Noise.h
	src/World.h
This commit is contained in:
Tiger Wang
2014-11-23 17:12:34 +00:00
parent 6382989ba0 dea8b684b2
commit 79e5b82354
99 changed files with 7166 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Chunk.cpp
View File

@@ -25,7 +25,7 @@
#include "BlockEntities/FlowerPotEntity.h"
#include "Entities/Pickup.h"
#include "Item.h"
#include "Noise.h"
#include "Noise/Noise.h"
#include "Root.h"
#include "Entities/Player.h"
#include "BlockArea.h"