Fixed merge issues with saplings, ready to pull now!
authorMark Holmquist <marktraceur@gmail.com>
Sat, 24 Sep 2011 01:19:47 +0000 (18:19 -0700)
committerMark Holmquist <marktraceur@gmail.com>
Sat, 24 Sep 2011 01:19:47 +0000 (18:19 -0700)
commitbc01ae4cbd6e9ba2bcc0b75bab8ba5d99fcc4e34
treec339a2873afc2050e7d9dcb8579601206ca07460
parent319f43e6d2d59b6062b3643b8cb26f4153cbc750
Fixed merge issues with saplings, ready to pull now!
src/content_mapnode.cpp
src/mapgen.cpp