[openjk] 06/19: Merge branch 'dev/appveyor'

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository openjk.

commit a1430421295d81d36eeedc5ec855acb3217b7180
Merge: 9a74ec2 d73ad88
Author: Xycaleth <alex at acslo.com>
Date:   Fri Jun 23 22:26:06 2017 +0100

    Merge branch 'dev/appveyor'

 appveyor.yml              | 20 ++++++++------------
 scripts/builds/deploy.bat | 20 ++++++++++++++++----
 2 files changed, 24 insertions(+), 16 deletions(-)

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