[mapserver-commits] [mapserver/mapserver] d2630c: Merge branch 'branch-4-10' into branch-5-0

[GitHub]

  Branch: refs/heads/branch-5-0
  Home:   https://github.com/mapserver/mapserver
  Commit: d2630ca6d078ec8afc420967049ca2193cd4445c
      https://github.com/mapserver/mapserver/commit/d2630ca6d078ec8afc420967049ca2193cd4445c
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Log Message:
  -----------
  Merge branch 'branch-4-10' into branch-5-0


  Commit: 74ce456aabdd9e01b2784d85acce3a06b4354fd5
      https://github.com/mapserver/mapserver/commit/74ce456aabdd9e01b2784d85acce3a06b4354fd5
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A .gitignore

  Log Message:
  -----------
  add gitignore


  Commit: 265eb962492f75fc9847989f187ef3ff3a7eee41
      https://github.com/mapserver/mapserver/commit/265eb962492f75fc9847989f187ef3ff3a7eee41
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A .gitignore

  Log Message:
  -----------
  Merge branch 'branch-4-10' into branch-5-0


  Commit: 6dd48cd3168df6e8f29dd64454deb293de0f784a
      https://github.com/mapserver/mapserver/commit/6dd48cd3168df6e8f29dd64454deb293de0f784a
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A stablemerge.sh

  Log Message:
  -----------
  add script to recursively apply stable fixes to newer branches


  Commit: 677c4ea72ace6c967e76e1a0050e24810fe9382b
      https://github.com/mapserver/mapserver/commit/677c4ea72ace6c967e76e1a0050e24810fe9382b
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-4-10' into branch-5-0


  Commit: 3e0c28c749ac098c32cc785100112938d1c58878
      https://github.com/mapserver/mapserver/commit/3e0c28c749ac098c32cc785100112938d1c58878
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  add files to ignore


  Commit: 0f6d22e67c864b1a79041d50a1a6373c1c958e6b
      https://github.com/mapserver/mapserver/commit/0f6d22e67c864b1a79041d50a1a6373c1c958e6b
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch 'branch-4-10' into branch-5-0


  Commit: a1f9568e4d71021c703a6130edac4895ac566258
      https://github.com/mapserver/mapserver/commit/a1f9568e4d71021c703a6130edac4895ac566258
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  correct test for git merge return value


  Commit: 0e89685c075aaf75d2eb862dfb7d47acbd227c50
      https://github.com/mapserver/mapserver/commit/0e89685c075aaf75d2eb862dfb7d47acbd227c50
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-4-10' into branch-5-0


  Commit: 9fb3b6f922440eef194ebf02a54cfb0dd65f4b2e
      https://github.com/mapserver/mapserver/commit/9fb3b6f922440eef194ebf02a54cfb0dd65f4b2e
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  fix again


  Commit: 973f93b97f1ef3e983be08633a3d7a2baddfb28d
      https://github.com/mapserver/mapserver/commit/973f93b97f1ef3e983be08633a3d7a2baddfb28d
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  Merge branch 'branch-4-10' into branch-5-0


Compare: https://github.com/mapserver/mapserver/compare/6b67f02...973f93b