[Warzone2100-commits] [Warzone2100/warzone2100] fad926: Actually use the include from our included quesogl...

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

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: fad926f03bf05e2fda409930156753cde1c5c52a
      https://github.com/Warzone2100/warzone2100/commit/fad926f03bf05e2fda409930156753cde1c5c52a
  Author: cybersphinx <ch...@gm...>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M configure.ac

  Log Message:
  -----------
  Actually use the include from our included quesoglc.

Fixes #3098.


  Commit: ce86eb66f4c808198c163c2df31b165cbed0417a
      https://github.com/Warzone2100/warzone2100/commit/ce86eb66f4c808198c163c2df31b165cbed0417a
  Author: automerge <cr...@wz...>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M configure.ac
  M data/mp/multiplay/skirmish/rules.js
  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

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


Compare: https://github.com/Warzone2100/warzone2100/compare/bf53f1b...ce86eb6