[Warzone2100-commits] [Warzone2100/warzone2100] aaeaa4: Restore missing check, so artefacts are only dropp...

2012-04-02 Thread automerge
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: aaeaa4140a157341f68eb827ddbfaf1e90c4261b
  
https://github.com/Warzone2100/warzone2100/commit/aaeaa4140a157341f68eb827ddbfaf1e90c4261b
  Author: Cyp 
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Restore missing check, so artefacts are only dropped by factories.

Check went missing in 29966c5da299f944a0e52ab579d2b3a7ed8d3063. (Although the 
entire
function was skipped before 29966c5da299f944a0e52ab579d2b3a7ed8d3063.)


  Commit: f861a8c308d2e74727ee47aedad629b4af88b1f8
  
https://github.com/Warzone2100/warzone2100/commit/f861a8c308d2e74727ee47aedad629b4af88b1f8
  Author: automerge 
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Merge branch 'bugfixes'


Compare: https://github.com/Warzone2100/warzone2100/compare/6db98fa...f861a8c
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] aaeaa4: Restore missing check, so artefacts are only dropp...

2012-04-01 Thread Cyp
  Branch: refs/heads/bugfixes
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: aaeaa4140a157341f68eb827ddbfaf1e90c4261b
  
https://github.com/Warzone2100/warzone2100/commit/aaeaa4140a157341f68eb827ddbfaf1e90c4261b
  Author: Cyp 
  Date:   2012-04-01 (Sun, 01 Apr 2012)

  Changed paths:
M src/multigifts.cpp

  Log Message:
  ---
  Restore missing check, so artefacts are only dropped by factories.

Check went missing in 29966c5da299f944a0e52ab579d2b3a7ed8d3063. (Although the 
entire
function was skipped before 29966c5da299f944a0e52ab579d2b3a7ed8d3063.)



--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits