Merge remote branches 'origin/cbrutail/effects-beams' and 'origin/cbrutail/space_elev...
-rw-r--r-- 4240 .gitattributes
-rw-r--r-- 27 .gitignore
drwxr-xr-x - env
drwxr-xr-x - maps
drwxr-xr-x - models
drwxr-xr-x - scripts
drwxr-xr-x - sound
drwxr-xr-x - textures