Merge remote-tracking branch 'marktraceur/master'
authorPerttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Mon, 26 Sep 2011 19:41:06 +0000 (22:41 +0300)
commita7833cca22bbb923efbc01fd0f820318a613eca6
treeb8da72d3e36b70f1cd018615ed38de5d009cfe57
parent08ac3454ccb473156d39ebf543d617c1541588ca
parentbc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34
Merge remote-tracking branch 'marktraceur/master'
src/content_mapnode.cpp
src/content_mapnode.h
src/environment.cpp
src/map.cpp
src/mapnode.h
src/server.cpp