Alexander Harkness 0de95a215f Merge remote-tracking branch 'origin/master' into foldermove2 ...

Conflicts:
	VC2008/MCServer.vcproj

2013-11-26 17:21:06 +00:00

..

ChunkDataSerializer.cpp

Further attempts to fix compile

2013-11-25 18:29:36 +00:00

ChunkDataSerializer.h

Moved source to src

2013-11-24 14:19:41 +00:00

Protocol14x.cpp

Further attempts to fix compile

2013-11-25 18:29:36 +00:00

Protocol14x.h

Moved source to src

2013-11-24 14:19:41 +00:00

Protocol15x.cpp

Moved source to src

2013-11-24 14:19:41 +00:00

Protocol15x.h

Moved source to src

2013-11-24 14:19:41 +00:00

Protocol16x.cpp

Moved source to src

2013-11-24 14:19:41 +00:00

Protocol16x.h

Moved source to src

2013-11-24 14:19:41 +00:00

Protocol17x.cpp

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00

Protocol17x.h

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00

Protocol125.cpp

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00

Protocol125.h

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00

Protocol132.cpp

Further attempts to fix compile

2013-11-25 18:29:36 +00:00

Protocol132.h

Further attempts to fix compile

2013-11-25 18:29:36 +00:00

Protocol.h

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00

ProtocolRecognizer.cpp

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00

ProtocolRecognizer.h

Merge remote-tracking branch 'origin/master' into foldermove2

2013-11-26 17:21:06 +00:00