Merge remote-tracking branch 'upstream/master' into controller-fix
Showing
- .travis.yml 17 additions, 17 deletions.travis.yml
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- appveyor.yml 2 additions, 2 deletionsappveyor.yml
- cmake/Modules/FindDiscordRPC.cmake 23 additions, 0 deletionscmake/Modules/FindDiscordRPC.cmake
- debian-template/source/options 0 additions, 3 deletionsdebian-template/source/options
- libs/DLL-README.txt 3 additions, 17 deletionslibs/DLL-README.txt
- libs/discord-rpc.props 16 additions, 0 deletionslibs/discord-rpc.props
- libs/discord-rpc/win32-dynamic/include/discord_register.h 26 additions, 0 deletionslibs/discord-rpc/win32-dynamic/include/discord_register.h
- libs/discord-rpc/win32-dynamic/include/discord_rpc.h 87 additions, 0 deletionslibs/discord-rpc/win32-dynamic/include/discord_rpc.h
- libs/discord-rpc/win32-dynamic/lib/discord-rpc.lib 0 additions, 0 deletionslibs/discord-rpc/win32-dynamic/lib/discord-rpc.lib
- libs/discord-rpc/win64-dynamic/include/discord_register.h 26 additions, 0 deletionslibs/discord-rpc/win64-dynamic/include/discord_register.h
- libs/discord-rpc/win64-dynamic/include/discord_rpc.h 87 additions, 0 deletionslibs/discord-rpc/win64-dynamic/include/discord_rpc.h
- libs/discord-rpc/win64-dynamic/lib/discord-rpc.lib 0 additions, 0 deletionslibs/discord-rpc/win64-dynamic/lib/discord-rpc.lib
- libs/dll-binaries/i686/discord-rpc.dll 0 additions, 0 deletionslibs/dll-binaries/i686/discord-rpc.dll
- libs/dll-binaries/x86_64/discord-rpc.dll 0 additions, 0 deletionslibs/dll-binaries/x86_64/discord-rpc.dll
- libs/drmingw/include/exchndl.h 39 additions, 0 deletionslibs/drmingw/include/exchndl.h
- libs/drmingw/lib/win32/libexchndl.a 0 additions, 0 deletionslibs/drmingw/lib/win32/libexchndl.a
- libs/drmingw/lib/win32/libmgwhelp.a 0 additions, 0 deletionslibs/drmingw/lib/win32/libmgwhelp.a
- src/CMakeLists.txt 33 additions, 3 deletionssrc/CMakeLists.txt
- src/Makefile 61 additions, 25 deletionssrc/Makefile
Loading
Please register or sign in to comment