[Warzone2100-commits] [Warzone2100/warzone2100] 6365f2: Check template validity before trying to build dro...

[automerge <cr...@wz...>]

  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 6365f2dbec51abb8ac2509c0623b54dce3e655fd
      https://github.com/Warzone2100/warzone2100/commit/6365f2dbec51abb8ac2509c0623b54dce3e655fd
  Author: Cyp <cy...@wz...>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M src/structure.cpp

  Log Message:
  -----------
  Check template validity before trying to build droids.


  Commit: 9fc92b7d64200c65f7ea8baab617ed8d19a773cf
      https://github.com/Warzone2100/warzone2100/commit/9fc92b7d64200c65f7ea8baab617ed8d19a773cf
  Author: cybersphinx <ch...@gm...>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M po/pl.po

  Log Message:
  -----------
  Polish translation update by Emdek.

Closes #1347.


  Commit: badb8c05cb3e9e8a8e1af529288d57b96126e482
      https://github.com/Warzone2100/warzone2100/commit/badb8c05cb3e9e8a8e1af529288d57b96126e482
  Author: cybersphinx <ch...@gm...>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M po/fr.po

  Log Message:
  -----------
  French translation update by Amiral JCDG.

Closes #3483.


  Commit: d74ebad6a32dbe49771223c347ad9515a101976b
      https://github.com/Warzone2100/warzone2100/commit/d74ebad6a32dbe49771223c347ad9515a101976b
  Author: cybersphinx <ch...@gm...>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M po/hu.po

  Log Message:
  -----------
  Hungarian translation update by mtomi78.

Closes #3485.


  Commit: a400fe055fd5d176cd809bcfdc0973cf839a4a2c
      https://github.com/Warzone2100/warzone2100/commit/a400fe055fd5d176cd809bcfdc0973cf839a4a2c
  Author: cybersphinx <ch...@gm...>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Turkish translation update by Ayhan Görgülü.

Closes #3486.


  Commit: c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37
      https://github.com/Warzone2100/warzone2100/commit/c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37
  Author: cybersphinx <ch...@gm...>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Dutch translation update by nino_romans.

Closes #3484.


  Commit: 52511cec6003e389307859535853eb96a9cf60a4
      https://github.com/Warzone2100/warzone2100/commit/52511cec6003e389307859535853eb96a9cf60a4
  Author: cybersphinx <ch...@gm...>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M src/map.cpp
    M tests/modeltest.c

  Log Message:
  -----------
  Fix some typos.

Thanks to pabs for noticing one of them. Closes #3495.


  Commit: e5d2242be00bdb665e0e8ea55adcbd90be462160
      https://github.com/Warzone2100/warzone2100/commit/e5d2242be00bdb665e0e8ea55adcbd90be462160
  Author: Paul Wise <pa...@de...>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M lib/netplay/netplay.cpp
    M lib/script/parse.h
    M src/qtscriptfuncs.cpp
    M src/scriptvals.h

  Log Message:
  -----------
  fix an FTBFS with -Werror=format-security

Fixes ticket:3493.


  Commit: 737b3d9d24ab1634dafd09558fc8b8a5354ffa9c
      https://github.com/Warzone2100/warzone2100/commit/737b3d9d24ab1634dafd09558fc8b8a5354ffa9c
  Author: vexed <ve...@wz...>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M src/game.cpp
    M src/objmem.cpp
    M src/structure.cpp

  Log Message:
  -----------
  Fix flag loading code to work for out of sequence factories.

fixes ticket:3384


  Commit: f04b5ddb8bde2aa6476a296aa88cb8f749d1ab84
      https://github.com/Warzone2100/warzone2100/commit/f04b5ddb8bde2aa6476a296aa88cb8f749d1ab84
  Author: automerge <cr...@wz...>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M lib/netplay/netplay.cpp
    M lib/script/parse.h
    M po/fr.po
    M po/hu.po
    M po/nl.po
    M po/pl.po
    M po/tr.po
    M src/game.cpp
    M src/map.cpp
    M src/objmem.cpp
    M src/qtscriptfuncs.cpp
    M src/scriptvals.h
    M src/structure.cpp
    M tests/modeltest.c

  Log Message:
  -----------
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/4a1e029...f04b5dd