Conflicts: .gitignore config.py libs/synapse/synapse.cpp plugins/imagehl/lbmlib.cpp plugins/surface_heretic2/surfacedialog.cpp plugins/surface_ufoai/surfacedialog.cpp radiant/brushscript.cpp radiant/main.cpp radiant/preferences.cpp tools/quake3/common/cmdlib.c tools/quake3/common/cmdlib.h tools/quake3/q3map2/path_init.c windows_compile_guide/index.html |
||
|---|---|---|
| .. | ||
| common | ||
| q3data | ||
| q3map2 | ||
| q3maporigin2originbrush.pl | ||