33aa8937d9
Conflicts: SConstruct common/main/multi.h similar/main/gamerend.c |
||
---|---|---|
.. | ||
conf.h | ||
descent.r | ||
messagebox.c | ||
SDL_main.c |
33aa8937d9
Conflicts: SConstruct common/main/multi.h similar/main/gamerend.c |
||
---|---|---|
.. | ||
conf.h | ||
descent.r | ||
messagebox.c | ||
SDL_main.c |