[openjk] 10/11: Merge tag 'upstream/0_20150104+ds1'

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit 24bc6472cccdaa8f938501fd7f65c675d9141a7a
Merge: 60f4509 7a5c138
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 4 18:43:25 2015 +0000

    Merge tag 'upstream/0_20150104+ds1'
    
    Upstream version 0~20150104+ds1

 code/cgame/cg_ents.cpp       | 15 +++++---
 code/cgame/cg_weapons.cpp    |  2 +-
 code/game/bg_vehicleLoad.cpp | 88 +++++++++++++++++++++++++++++---------------
 3 files changed, 69 insertions(+), 36 deletions(-)

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