Conflicts: Makefile code/renderercommon/qgl.h code/renderergl1/tr_local.h code/sdl/sdl_glimp.c |
||
|---|---|---|
| .. | ||
| sdl_gamma.c | ||
| sdl_glimp.c | ||
| sdl_icon.h | ||
| sdl_input.c | ||
| sdl_snd.c | ||
Conflicts: Makefile code/renderercommon/qgl.h code/renderergl1/tr_local.h code/sdl/sdl_glimp.c |
||
|---|---|---|
| .. | ||
| sdl_gamma.c | ||
| sdl_glimp.c | ||
| sdl_icon.h | ||
| sdl_input.c | ||
| sdl_snd.c | ||