Merge branch 'udmf-executor-triggers' into udmf-thing-types
# Conflicts: # extras/conf/udb/Includes/SRB222_things.cfg
Showing
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- assets/CMakeLists.txt 1 addition, 2 deletionsassets/CMakeLists.txt
- assets/README.txt 24 additions, 25 deletionsassets/README.txt
- extras/conf/SRB2-22.cfg 3 additions, 3 deletionsextras/conf/SRB2-22.cfg
- extras/conf/udb/Includes/SRB222_things.cfg 7 additions, 7 deletionsextras/conf/udb/Includes/SRB222_things.cfg
- src/Makefile 2 additions, 2 deletionssrc/Makefile
- src/Makefile.d/features.mk 75 additions, 75 deletionssrc/Makefile.d/features.mk
- src/am_map.c 1 addition, 1 deletionsrc/am_map.c
- src/am_map.h 1 addition, 1 deletionsrc/am_map.h
- src/apng.c 1 addition, 1 deletionsrc/apng.c
- src/apng.h 1 addition, 1 deletionsrc/apng.h
- src/asm_defs.inc 1 addition, 1 deletionsrc/asm_defs.inc
- src/b_bot.c 1 addition, 1 deletionsrc/b_bot.c
- src/b_bot.h 1 addition, 1 deletionsrc/b_bot.h
- src/byteptr.h 1 addition, 1 deletionsrc/byteptr.h
- src/command.c 1 addition, 1 deletionsrc/command.c
- src/command.h 1 addition, 1 deletionsrc/command.h
- src/config.h.in 4 additions, 3 deletionssrc/config.h.in
- src/console.c 1 addition, 1 deletionsrc/console.c
- src/console.h 1 addition, 1 deletionsrc/console.h
Loading
Please register or sign in to comment