Merge branch 'master' into newrules
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Fri, 22 Jun 2012 04:53:42 +0000 (00:53 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Fri, 22 Jun 2012 04:53:42 +0000 (00:53 -0400)
commit8baf5888fdfa9d635b4c3b723c6a57f7a97d82ba
tree01ef65a23fece83c4bf554efce4b026405dc2739
parenta1b83aaa4af4896230eeae32c21b22a0a0a87b19
parent827acb6db0e4fb030cac635e91fe5f7d0da2b649
Merge branch 'master' into newrules

Conflicts:
src/shape.c

moved the changed code up to where it should be.
include/spacedolphin.h
src/move.c
src/shape.c