Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: cdb8c18d045d5ae6d640c0218997adeb80f5d1d0
https://github.com/Warzone2100/warzone2100/commit/cdb8c18d045d5ae6d640c0218997adeb80f5d1d0
Author: vexed <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M tests/Makefile.am
Log Message:
-----------
Try a alternative fix for 5694a6fded95e7128c6b8222f6895ba200b75432
Commit: c155e9fe80d6768f35b14d1f2fcf8c4a89656822
https://github.com/Warzone2100/warzone2100/commit/c155e9fe80d6768f35b14d1f2fcf8c4a89656822
Author: vexed <[email protected]>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M configure.ac
M data/Makefile.am
R data/mods/multiplay/Makefile.am
R data/mods/multiplay/old-1.10-balance/doc/readme.txt
R data/mods/multiplay/old-1.10-balance/images/frontend0.png
R data/mods/multiplay/old-1.10-balance/messages/strings/names.txt
R data/mods/multiplay/old-1.10-balance/stats/body.txt
R data/mods/multiplay/old-1.10-balance/stats/bodypropulsionimd.txt
R data/mods/multiplay/old-1.10-balance/stats/brain.txt
R data/mods/multiplay/old-1.10-balance/stats/construction.txt
R data/mods/multiplay/old-1.10-balance/stats/ecm.txt
R data/mods/multiplay/old-1.10-balance/stats/features.txt
R data/mods/multiplay/old-1.10-balance/stats/functions.txt
R data/mods/multiplay/old-1.10-balance/stats/propulsion.txt
R data/mods/multiplay/old-1.10-balance/stats/propulsiontype.txt
R data/mods/multiplay/old-1.10-balance/stats/repair.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/prresearch.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/redcomponents.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/redstructure.txt
R data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/research.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/researchfunctions.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/researchstruct.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/resultcomponent.txt
R
data/mods/multiplay/old-1.10-balance/stats/research/multiplayer/resultstructure.txt
R data/mods/multiplay/old-1.10-balance/stats/sensor.txt
R data/mods/multiplay/old-1.10-balance/stats/structurefunctions.txt
R data/mods/multiplay/old-1.10-balance/stats/structuremodifier.txt
R data/mods/multiplay/old-1.10-balance/stats/structures.txt
R data/mods/multiplay/old-1.10-balance/stats/structureweapons.txt
R data/mods/multiplay/old-1.10-balance/stats/terraintable.txt
R data/mods/multiplay/old-1.10-balance/stats/weaponmodifier.txt
R data/mods/multiplay/old-1.10-balance/stats/weapons.txt
R data/mods/multiplay/old-1.10-balance/stats/weaponsounds.txt
R data/mods/multiplay/old-1.10-balance/wrf/multires.wrf
R data/mods/multiplay/old-1.10-balance/wrf/multires2.wrf
R data/mods/multiplay/old-1.10-balance/wrf/multires3.wrf
A data/mods/thisDirectoryIsEmpty
M data/mp/components/bodies/drtrans.pie
M data/mp/messages/strings/names.txt
M data/mp/messages/strings/resstrings.txt
M data/mp/stats/assignweapons.txt
M data/mp/stats/body.ini
M data/mp/stats/research/multiplayer/prresearch.txt
M data/mp/stats/research/multiplayer/research.txt
M data/mp/stats/research/multiplayer/resultcomponent.txt
M data/mp/stats/templates.txt
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M lib/netplay/netplay.cpp
M macosx/configs/fetchscripts/Png-FetchSource.sh
M pkg/nsis/warzone2100.nsi
M po/POTFILES.in
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/clparse.cpp
M src/configuration.cpp
M src/design.cpp
M src/design.h
M src/frontend.cpp
M src/frontend.h
M src/hci.h
M src/intdisplay.cpp
M src/mapdisplay.cpp
M src/multiint.cpp
M src/multiint.h
M src/multiplay.h
M src/radar.cpp
M src/research.cpp
M src/selection.cpp
M src/terrain.cpp
M src/warzoneconfig.cpp
M src/warzoneconfig.h
M tests/Makefile.am
Log Message:
-----------
Merge branch 'bugfixes'
Conflicts:
data/mp/stats/body.txt
Compare: https://github.com/Warzone2100/warzone2100/compare/de2aa9f...c155e9f
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
