Merge branch 'master' into kinetic
[situare] / src / engine /
drwxr-xr-x   ..
-rw-r--r-- 20703 engine.cpp
-rw-r--r-- 8185 engine.h