Merge branch 'rm-scripts'
commitb1e1d31cb8e3ef5388671ccf670f151d8a8eba52
authorPaul Merrill <napalminc@gmail.com>
Thu, 8 Dec 2011 05:16:19 +0000 (7 21:16 -0800)
committerPaul Merrill <napalminc@gmail.com>
Thu, 8 Dec 2011 05:16:19 +0000 (7 21:16 -0800)
tree5303d2d64618c531b5bf153bddf1dcfd9fa3dd6e
parentbecdcb81eed76d5c4771b52d675485b7ef6bd1c2
parent87b20f4464e37d8c6607c065073d03b313437175
Merge branch 'rm-scripts'
Makefile
src/Makefile
src/entity.cpp
src/entity.h
src/resourcer.cpp
src/resourcer.h