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

[GitHub]

  Branch: refs/heads/branch-5-6
  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: b5537b3cc7183a403f60258aff0b09ec34008102
      https://github.com/mapserver/mapserver/commit/b5537b3cc7183a403f60258aff0b09ec34008102
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Log Message:
  -----------
  Merge branch 'branch-5-0' into branch-5-2


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

  Log Message:
  -----------
  Merge branch 'branch-5-2' into branch-5-4


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

  Log Message:
  -----------
  Merge branch 'branch-5-4' into branch-5-6


  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: 0f219723d35ca834fb4d8c35eba2f752a895047b
      https://github.com/mapserver/mapserver/commit/0f219723d35ca834fb4d8c35eba2f752a895047b
  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-5-0' into branch-5-2


  Commit: b683965c4108be07ec332cdeac6a463a790a7ca4
      https://github.com/mapserver/mapserver/commit/b683965c4108be07ec332cdeac6a463a790a7ca4
  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-5-2' into branch-5-4


  Commit: b33196b57b46488ba438c969a39b024a2c999e67
      https://github.com/mapserver/mapserver/commit/b33196b57b46488ba438c969a39b024a2c999e67
  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-5-4' into branch-5-6


  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: ed8a64b43bdae9e2c35bbca4c1f6ee8c17b544b0
      https://github.com/mapserver/mapserver/commit/ed8a64b43bdae9e2c35bbca4c1f6ee8c17b544b0
  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-5-0' into branch-5-2


  Commit: 3ee6f5a6877fe9b86304cb70313a521f2ba15619
      https://github.com/mapserver/mapserver/commit/3ee6f5a6877fe9b86304cb70313a521f2ba15619
  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-5-2' into branch-5-4


  Commit: 31697f55bf11a35ca702575f18b109202380c8c9
      https://github.com/mapserver/mapserver/commit/31697f55bf11a35ca702575f18b109202380c8c9
  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-5-4' into branch-5-6


  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: 4923c8bd524badaa418533880751a6831a46028d
      https://github.com/mapserver/mapserver/commit/4923c8bd524badaa418533880751a6831a46028d
  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-5-0' into branch-5-2


  Commit: ab1ee9e95a86ae33a138294d22c60f31430a7b6f
      https://github.com/mapserver/mapserver/commit/ab1ee9e95a86ae33a138294d22c60f31430a7b6f
  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-5-2' into branch-5-4


  Commit: 8b8e4dc2bdd97e7f3526a016abf3aae8753dffe1
      https://github.com/mapserver/mapserver/commit/8b8e4dc2bdd97e7f3526a016abf3aae8753dffe1
  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-5-4' into branch-5-6


  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: 96f947fa8d6437adcaa8641fb41429a88e003db2
      https://github.com/mapserver/mapserver/commit/96f947fa8d6437adcaa8641fb41429a88e003db2
  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-5-0' into branch-5-2


  Commit: 8566842ac7dc238f46b892dbd8c3aff517c507c8
      https://github.com/mapserver/mapserver/commit/8566842ac7dc238f46b892dbd8c3aff517c507c8
  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-5-2' into branch-5-4


  Commit: 5e034e85d86312cdd088fd742e43e09b0a4c5e90
      https://github.com/mapserver/mapserver/commit/5e034e85d86312cdd088fd742e43e09b0a4c5e90
  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-5-4' into branch-5-6


  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


  Commit: 246de98a1c9030c8d61bf1cb8c1e5f1918b35ea1
      https://github.com/mapserver/mapserver/commit/246de98a1c9030c8d61bf1cb8c1e5f1918b35ea1
  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-5-0' into branch-5-2


  Commit: 34fe40f2623a47fbbaff21e3c477f12e08b3d324
      https://github.com/mapserver/mapserver/commit/34fe40f2623a47fbbaff21e3c477f12e08b3d324
  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-5-2' into branch-5-4


  Commit: db5ee0bb080e34388fb4c53eed37067af8c4dde0
      https://github.com/mapserver/mapserver/commit/db5ee0bb080e34388fb4c53eed37067af8c4dde0
  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-5-4' into branch-5-6


Compare: https://github.com/mapserver/mapserver/compare/6cd958c...db5ee0b