[openjk] branch upstream updated (689c6bd -> f546f94)

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a change to branch upstream
in repository openjk.

      from  689c6bd   Imported Upstream version 0~20150318+ds1
       new  f546f94   Imported Upstream version 0~20150323+ds1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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
 {codemp/win32 => shared/icons}/icon.ico | Bin
 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(-)
 create mode 100644 CMakeModules/FindJPEG.cmake
 create mode 100644 CMakeModules/FindPNG.cmake
 create mode 100644 CMakeModules/LICENSE_1_0.txt
 create mode 100644 code/macosx/OpenJK.icns
 create mode 100644 codeJK2/macosx/OpenJK.icns
 create mode 100644 codemp/macosx/OpenJK.icns
 create mode 100644 shared/icons/OpenJK_IconPSD.psd
 create mode 100644 shared/icons/OpenJK_Icon_1024.png
 create mode 100644 shared/icons/OpenJK_Icon_128.png
 create mode 100644 shared/icons/OpenJK_Icon_16.png
 create mode 100644 shared/icons/OpenJK_Icon_32.png
 create mode 100644 shared/icons/OpenJK_Icon_64.png
 copy {codemp/win32 => shared/icons}/icon.ico (100%)
 create mode 100644 shared/icons/license.txt
 create mode 100644 shared/icons/ocgDGfu.png
 create mode 100644 shared/sdl/sdl_icon.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git