[mapserver-commits] [mapserver/mapserver] 3a7077: prepare for 6.2.2 release

[GitHub]

  Branch: refs/heads/branch-6-4
  Home:   https://github.com/mapserver/mapserver
  Commit: 3a70778f80c4f93409ba08b1479199f6105971fd
      https://github.com/mapserver/mapserver/commit/3a70778f80c4f93409ba08b1479199f6105971fd
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M HISTORY.TXT
    M mapserver.h

  Log Message:
  -----------
  prepare for 6.2.2 release


  Commit: 4186abc50f83fae98310a5370ada45cbf8f68e09
      https://github.com/mapserver/mapserver/commit/4186abc50f83fae98310a5370ada45cbf8f68e09
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  fix ubuntu package names in travis


  Commit: fb41883abfd76555ae276fe9cad3ae25dbde2884
      https://github.com/mapserver/mapserver/commit/fb41883abfd76555ae276fe9cad3ae25dbde2884
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

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

Conflicts:
	.travis.yml
	HISTORY.TXT
	mapserver.h


  Commit: 44ac0871f511e0678795b601cb5c69a52776e25f
      https://github.com/mapserver/mapserver/commit/44ac0871f511e0678795b601cb5c69a52776e25f
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2014-01-02 (Thu, 02 Jan 2014)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  prepare for 6.4.1 release


Compare: https://github.com/mapserver/mapserver/compare/d44431a802a2...44ac0871f511