Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: cf317799adf0370a4bdb8067ba8aeeeb5c9f6d36
https://github.com/Warzone2100/warzone2100/commit/cf317799adf0370a4bdb8067ba8aeeeb5c9f6d36
Author: per <p...@wz2100.net>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M src/multimenu.cpp
Log Message:
-----------
Fix off-by-one memory error
(cherry picked from commit 1e6e097e7ab5112b4e603c2996ced41dccf77df9)
Commit: c2ded00ed4dc6a8ffbb2c1e2a608b92132baa111
https://github.com/Warzone2100/warzone2100/commit/c2ded00ed4dc6a8ffbb2c1e2a608b92132baa111
Author: vexed <ve...@wz2100.net>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M src/multiint.cpp
M src/multiint.h
Log Message:
-----------
Fix AI picking to show at most 8 AIs, because of the limitations of the GUI.
closes ticket:3147
(cherry picked from commit 20c7024a9bfff73ce3a9338a17381cfb110a1d40)
Commit: d5428b94e48bc8209abcf1dc2e865fff03a2c140
https://github.com/Warzone2100/warzone2100/commit/d5428b94e48bc8209abcf1dc2e865fff03a2c140
Author: vexed <ve...@wz2100.net>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M src/multiint.cpp
Log Message:
-----------
Fix a off by one error for AI count.
Commit: 15c1e5c5d8bdb8515a5e414b6e7c7a5064ae6380
https://github.com/Warzone2100/warzone2100/commit/15c1e5c5d8bdb8515a5e414b6e7c7a5064ae6380
Author: vexed <ve...@wz2100.net>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M src/multiint.cpp
Log Message:
-----------
Merge branch 'bugfixes'
Conflicts:
src/multiint.cpp
(Note, this merge is more or less a dummy commit, since most of this was already
in master anyway... just trying to sync everything up)
Compare:
https://github.com/Warzone2100/warzone2100/compare/1c5e5739e0c8...15c1e5c5d8bd
------------------------------------------------------------------------------
Android is increasing in popularity, but the open development platform that
developers love is also attractive to malware creators. Download this white
paper to learn more about secure code signing practices that can help keep
Android apps secure.
http://pubads.g.doubleclick.net/gampad/clk?id=65839951&iu=/4140/ostg.clktrk
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
