[mapserver-commits] [mapserver/mapserver] 1f5549: update for 6.2.0-rc1

[GitHub]

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

  Changed paths:
    M mapserver.h

  Log Message:
  -----------
  update for 6.2.0-rc1


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

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

Conflicts:
	mapserver.h


Compare: https://github.com/mapserver/mapserver/compare/70d2510636a6...b8e6e0cbe0e5