Merge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb' (C.Brutail's launchpad fixes)
-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