Merge branch 'master' into soc-2013-rigid_body_sim
-rw-r--r-- 169 .arcconfig
-rw-r--r-- 247 .gitignore
-rw-r--r-- 435 .gitmodules
-rw-r--r-- 82534 CMakeLists.txt
-rw-r--r-- 302 COPYING
-rw-r--r-- 13085 GNUmakefile
-rw-r--r-- 47436 SConstruct
drwxr-xr-x - build_files
drwxr-xr-x - doc
drwxr-xr-x - extern
drwxr-xr-x - intern
drwxr-xr-x - release
m--------- - scons
drwxr-xr-x - source