[Warzone2100-commits] [Warzone2100/warzone2100] c3ba96: Check for automake 1.11, for dist-xz support.

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

  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: c3ba9625b96fea6ceb036cd387a511a98523bd86
      https://github.com/Warzone2100/warzone2100/commit/c3ba9625b96fea6ceb036cd387a511a98523bd86
  Author: Cyp <cy...@wz...>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M autogen.sh
    M configure.ac

  Log Message:
  -----------
  Check for automake 1.11, for dist-xz support.

If you have 1.11, but the check still fails, then run:
WANT_AUTOMAKE=1.11 ./autogen.sh

See 512ef27f4d4185d004977e0be4b972bfa130c57d.


  Commit: a05e8c980bc42fa66ed1b81ae40793645df8efbf
      https://github.com/Warzone2100/warzone2100/commit/a05e8c980bc42fa66ed1b81ae40793645df8efbf
  Author: dak180 <da...@us...>
  Date:   2012-08-31 (Fri, 31 Aug 2012)

  Changed paths:
    M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Patch PhysFS in the mac build until there is a new release.

Refs #3700.


  Commit: 7720aa641da1a8236029949cad05e8bf985ed6e6
      https://github.com/Warzone2100/warzone2100/commit/7720aa641da1a8236029949cad05e8bf985ed6e6
  Author: dak180 <da...@us...>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
    M macosx/Warzone.xcodeproj/project.pbxproj

  Log Message:
  -----------
  Add some more .strings files to the mac build.

Also make sure the licence actually makes it into the builds.


  Commit: f3bf40bfa4d4d1c81e15eca82781cbb60ebd5590
      https://github.com/Warzone2100/warzone2100/commit/f3bf40bfa4d4d1c81e15eca82781cbb60ebd5590
  Author: automerge <cr...@wz...>
  Date:   2012-09-02 (Sun, 02 Sep 2012)

  Changed paths:
    M autogen.sh
    M configure.ac
    M macosx/Resources/wzlocal/English.lproj/COPYING.NONGPL.txt
    M macosx/Warzone.xcodeproj/project.pbxproj

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


Compare: https://github.com/Warzone2100/warzone2100/compare/fdf9558e5c87...f3bf40bfa4d4