[SCM] Packaging for bzflag branch, master, updated. upstream/2.0.16-61-g70bed9d
Ryan Kavanagh
rak at debian.org
Mon Jul 23 22:57:27 UTC 2012
The following commit has been merged in the master branch:
commit 6345826490b13db8620c3756d94d9cbe7e3fd5be
Merge: 9e653dd26fa7e1a47cde53bfae6b9da0e27b6233 7d0b8a47bd326d8287355dd32f64fb42aad64eb8
Author: Ryan Kavanagh <rak at debian.org>
Date: Wed Jul 18 21:14:22 2012 -0400
Merge branch 'upstream'
Conflicts:
MSVC/bzflag.rc
Makefile
README.WIN32
RELNOTES
data/green_tank.png
data/hunter_tank.png
data/mountain1.png
data/mountain2.png
data/mountain3.png
data/title.png
include/OpenGLDisplayList.h
man/Makefile
package/Makefile
package/win32/install.dsw
package/win32/nsis/DisableCheck.bmp
package/win32/nsis/EnableCheck.bmp
src/Makefile
src/bzflag/Makefile
src/bzflag/bzflag.rc
src/bzfs/Makefile
src/c-ares/vc/adig/adig.dsp
src/c-ares/vc/ahost/ahost.dsp
src/c-ares/vc/areslib/areslib.dsp
src/c-ares/vc/vc.dsw
src/common/Makefile
src/geometry/Makefile
src/net/Makefile
src/obstacle/Makefile
src/ogl/Makefile
src/ogl/OpenGLDisplayList.cxx
src/other/curl/vc6curl.dsw
src/other/glew/doc/gpl.txt
src/platform/Makefile
src/scene/Makefile
win32/bzflag.rc
--
Packaging for bzflag
More information about the Pkg-games-commits
mailing list