[mapserver-commits] [mapserver/mapserver] d195ac: update for beta3

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: d195ac798e9588f7d0da714b3581962bb6b4dc5b
      https://github.com/mapserver/mapserver/commit/d195ac798e9588f7d0da714b3581962bb6b4dc5b
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M mapserver.h

  Log Message:
  -----------
  update for beta3


  Commit: 7c7e4b2a0f801360900068f16a7735aa9134bb14
      https://github.com/mapserver/mapserver/commit/7c7e4b2a0f801360900068f16a7735aa9134bb14
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

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


  Commit: 97c54b72dd26a0611bbcf14b52fee8335b352a26
      https://github.com/mapserver/mapserver/commit/97c54b72dd26a0611bbcf14b52fee8335b352a26
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M mapserver.h

  Log Message:
  -----------
  update for beta3


  Commit: 902da920a5e3fa63a127ab826302a409e5c28709
      https://github.com/mapserver/mapserver/commit/902da920a5e3fa63a127ab826302a409e5c28709
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

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

Conflicts:
	mapserver.h


  Commit: 1f0e7dfe73f1d529851130ef6cc2149a470473ee
      https://github.com/mapserver/mapserver/commit/1f0e7dfe73f1d529851130ef6cc2149a470473ee
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-09-10 (Mon, 10 Sep 2012)

  Changed paths:
    M mapdraw.c
    M maprendering.c
    M mapserver.h
    M mapwms.c

  Log Message:
  -----------
  Merge branch 'master' of github.com:mapserver/mapserver


Compare: https://github.com/mapserver/mapserver/compare/5bf7c5068699...1f0e7dfe73f1