fix conflict
Showing
- src/hardware/hw_main.c 2 additions, 2 deletionssrc/hardware/hw_main.c
- src/m_anigif.c 49 additions, 3 deletionssrc/m_anigif.c
- src/m_misc.c 2 additions, 6 deletionssrc/m_misc.c
- src/r_data.c 1 addition, 2 deletionssrc/r_data.c
- src/r_data.h 2 additions, 0 deletionssrc/r_data.h
- src/sdl/i_video.c 2 additions, 3 deletionssrc/sdl/i_video.c
- src/v_video.c 22 additions, 5 deletionssrc/v_video.c
- src/v_video.h 12 additions, 0 deletionssrc/v_video.h
Loading
Please register or sign in to comment