Conflicts: SConstruct common/include/editor/ehostage.h common/main/cntrlcen.h common/main/laser.h common/main/mission.h common/main/net_udp.h common/main/object.h main/vers_id.h similar/editor/kfuncs.c similar/main/inferno.c similar/main/lighting.c similar/main/multibot.c similar/main/newmenu.c similar/main/physics.c |
||
---|---|---|
.. | ||
2d | ||
3d | ||
arch | ||
editor | ||
include | ||
main | ||
maths | ||
misc | ||
texmap | ||
ui |