[mapserver-commits] [mapserver/mapserver] f2b56e: Merge branch 'branch-6-0' of github.com:mapserver/...

[GitHub]

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

  Changed paths:
    M HISTORY.TXT
  M mapcopy.c

  Log Message:
  -----------
  Merge branch 'branch-6-0' of github.com:mapserver/mapserver into branch-6-0


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

  Changed paths:
    M HISTORY.TXT

  Log Message:
  -----------
  s/SVN/git


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

  Changed paths:
    M HISTORY.TXT

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


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

  Changed paths:
    M HISTORY.TXT

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


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

  Changed paths:
    M HISTORY.TXT

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


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

  Changed paths:
    M HISTORY.TXT

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


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

  Changed paths:
    M HISTORY.TXT

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


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

  Changed paths:
    M HISTORY.TXT

  Log Message:
  -----------
  Merge branch 'branch-6-0'

Conflicts:
	HISTORY.TXT


Compare: https://github.com/mapserver/mapserver/compare/e4fa616...a1663fb