| commit | 44af76a95a98dbbfbfcce47ec6d98fa9110231a3 | |
| author | Paul Merrill <napalminc@gmail.com> | |
| Sat, 19 May 2012 00:34:05 +0000 (18 17:34 -0700) | ||
| committer | Paul Merrill <napalminc@gmail.com> | |
| Sat, 19 May 2012 00:37:25 +0000 (18 17:37 -0700) | ||
| tree | 7e3a9b02f16064c05a5925a0c3ed794b7cf11f18 | treesnapshot (tar.gz zip) |
| parent | 63c0cb3a9978775d152640e2927155bdc9f6c90e | commitdiff |
| parent | 13653daa3c19677ee28aa30f5d84ba275f6de84a | commitdiff |
Merge branch 'onupdate'
Conflicts:
data/testing/areas/g01_load.py
data/testing/entities/wizard/ai.py
src/entity.cpp
improved script lists in Entity
Conflicts:
data/testing/areas/g01_load.py
data/testing/entities/wizard/ai.py
src/entity.cpp
improved script lists in Entity
| src/Makefile | diff1 | diff2 | blobhistory |
| src/entity.cpp | diff1 | diff2 | blobhistory |
| src/entity.h | diff1 | diff2 | blobhistory |
| src/scriptinst.cpp | diff2 | blobhistory |