[openjk] 04/05: Merge tag 'upstream/0_20150323+ds1'
Simon McVittie
smcv at debian.org
Mon Mar 23 22:39:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit 1879a956f214c692e34ebd269ea13d4d085fe1b9
Merge: dd43cb6 f546f94
Author: Simon McVittie <smcv at debian.org>
Date: Mon Mar 23 21:33:07 2015 +0000
Merge tag 'upstream/0_20150323+ds1'
Upstream version 0~20150323+ds1
CMakeModules/FindJPEG.cmake | 72 +++++++++++++++
CMakeModules/FindPNG.cmake | 91 +++++++++++++++++++
CMakeModules/FindSDL2.cmake | 34 +++++--
CMakeModules/InstallZIP.cmake | 38 ++++++--
CMakeModules/LICENSE_1_0.txt | 26 ++++++
code/macosx/OpenJK.icns | Bin 0 -> 246869 bytes
code/qcommon/tri_coll_test.cpp | 18 ++++
code/rd-common/tr_public.h | 4 +-
code/rd-vanilla/tr_bsp.cpp | 4 +-
code/rd-vanilla/tr_init.cpp | 3 +-
codeJK2/macosx/OpenJK.icns | Bin 0 -> 246869 bytes
codemp/CMakeLists.txt | 22 +++--
codemp/cgame/CMakeLists.txt | 22 +++++
codemp/game/CMakeLists.txt | 22 +++++
codemp/game/tri_coll_test.c | 18 ++++
codemp/macosx/OpenJK.icns | Bin 0 -> 246869 bytes
codemp/rd-common/tr_public.h | 4 +-
codemp/rd-vanilla/tr_bsp.cpp | 4 +-
codemp/rd-vanilla/tr_init.cpp | 3 +-
codemp/ui/CMakeLists.txt | 22 +++++
shared/icons/OpenJK_IconPSD.psd | Bin 0 -> 1672382 bytes
shared/icons/OpenJK_Icon_1024.png | Bin 0 -> 298812 bytes
shared/icons/OpenJK_Icon_128.png | Bin 0 -> 15714 bytes
shared/icons/OpenJK_Icon_16.png | Bin 0 -> 1514 bytes
shared/icons/OpenJK_Icon_32.png | Bin 0 -> 2678 bytes
shared/icons/OpenJK_Icon_64.png | Bin 0 -> 6056 bytes
shared/icons/icon.ico | Bin 0 -> 3262 bytes
shared/icons/license.txt | 28 ++++++
shared/icons/ocgDGfu.png | Bin 0 -> 7788 bytes
shared/sdl/sdl_icon.h | 186 ++++++++++++++++++++++++++++++++++++++
shared/sdl/sdl_window.cpp | 53 +++++++++--
shared/sys/sys_public.h | 31 +++++--
32 files changed, 652 insertions(+), 53 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list