Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b52a42cad34485c9ff342791aca2e3fa2bc50672
      
https://github.com/Warzone2100/warzone2100/commit/b52a42cad34485c9ff342791aca2e3fa2bc50672
  Author: felippico <sailboat.joaqu...@gmail.com>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    A tools/csv2ini/csv2ini.php
    A tools/csv2ini/readme.txt

  Log Message:
  -----------
  Add csv2ini tool. Closes ticket:3792


  Commit: 010dbc081e1e817e11b9a32fe2581a249a22b649
      
https://github.com/Warzone2100/warzone2100/commit/010dbc081e1e817e11b9a32fe2581a249a22b649
  Author: Per Inge Mathisen <p...@wz2100.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    M data/mp/multiplay/skirmish/semperfi.js
    M src/qtscript.cpp
    M src/qtscript.h
    M src/qtscriptfuncs.cpp
    M src/qtscriptfuncs.h

  Log Message:
  -----------
  qtscript: Now uses its own group system, instead of the same system as 
wzscript,
transporters and commanders. Unlike previous system, each script context has its
own group definitions. Also it fires off an event when the group becomes empty.
You can also define groups in the labels.ini file. Group sizes are stored in the
groupSizes[] global sparse array for easy access.


  Commit: 16972ae6a987871351ac11cc2204b91bb8190817
      
https://github.com/Warzone2100/warzone2100/commit/16972ae6a987871351ac11cc2204b91bb8190817
  Author: Per Inge Mathisen <p...@wz2100.net>
  Date:   2012-11-19 (Mon, 19 Nov 2012)

  Changed paths:
    A data/base/wrf/cam1/cam1a/droid.ini
    M data/base/wrf/cam1/cam1a/labels.ini
    M po/pt_BR.po
    M src/game.cpp
    M src/qtscriptfuncs.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:Warzone2100/warzone2100

Conflicts:
        src/qtscriptfuncs.cpp


Compare: 
https://github.com/Warzone2100/warzone2100/compare/9bddcfd4b2fc...16972ae6a987
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to