Merge branch 'next' into 'addplayer'
# Conflicts: # src/lua_baselib.c # src/r_skins.c
Showing
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- dep/.gitignore 2 additions, 0 deletionsdep/.gitignore
- dep/FreeBSD/SDL/Debug/.gitignore 2 additions, 0 deletionsdep/FreeBSD/SDL/Debug/.gitignore
- dep/FreeBSD/SDL/Release/.gitignore 2 additions, 0 deletionsdep/FreeBSD/SDL/Release/.gitignore
- dep/Linux/SDL/Debug/.gitignore 2 additions, 0 deletionsdep/Linux/SDL/Debug/.gitignore
- dep/Linux/SDL/Release/.gitignore 2 additions, 0 deletionsdep/Linux/SDL/Release/.gitignore
- dep/Linux64/SDL/Debug/.gitignore 2 additions, 0 deletionsdep/Linux64/SDL/Debug/.gitignore
- dep/Linux64/SDL/Release/.gitignore 2 additions, 0 deletionsdep/Linux64/SDL/Release/.gitignore
- dep/MasterClient/.gitignore 2 additions, 0 deletionsdep/MasterClient/.gitignore
- dep/MasterServer/.gitignore 2 additions, 0 deletionsdep/MasterServer/.gitignore
- dep/Mingw/Debug/.gitignore 2 additions, 0 deletionsdep/Mingw/Debug/.gitignore
- dep/Mingw/Release/.gitignore 2 additions, 0 deletionsdep/Mingw/Release/.gitignore
- dep/Mingw/SDL/Debug/.gitignore 2 additions, 0 deletionsdep/Mingw/SDL/Debug/.gitignore
- dep/Mingw/SDL/Release/.gitignore 2 additions, 0 deletionsdep/Mingw/SDL/Release/.gitignore
- dep/Mingw64/Debug/.gitignore 2 additions, 0 deletionsdep/Mingw64/Debug/.gitignore
- dep/Mingw64/Release/.gitignore 2 additions, 0 deletionsdep/Mingw64/Release/.gitignore
- dep/Mingw64/SDL/Debug/.gitignore 2 additions, 0 deletionsdep/Mingw64/SDL/Debug/.gitignore
- dep/Mingw64/SDL/Release/.gitignore 2 additions, 0 deletionsdep/Mingw64/SDL/Release/.gitignore
- dep/SDL/Release/.gitignore 2 additions, 0 deletionsdep/SDL/Release/.gitignore
- dep/VC/.gitignore 2 additions, 0 deletionsdep/VC/.gitignore
Loading
Please register or sign in to comment