[mapserver-commits] [mapserver/mapserver] 910a99: cherry picked gcc-only fix for #4231

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 910a99aeffdbea671962276942bef5c9c0712a0f
      https://github.com/mapserver/mapserver/commit/910a99aeffdbea671962276942bef5c9c0712a0f
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-05-05 (Sat, 05 May 2012)

  Changed paths:
    M mapserver.h

  Log Message:
  -----------
  cherry picked gcc-only fix for #4231


  Commit: 7801ec799739dba98c1777512f4668824cd871b9
      https://github.com/mapserver/mapserver/commit/7801ec799739dba98c1777512f4668824cd871b9
  Author: Alan Boudreault <aboudreault at mapgears.com>
  Date:   2012-05-16 (Wed, 16 May 2012)

  Changed paths:
    M HISTORY.TXT
    M mapscript/swiginc/symbol.i

  Log Message:
  -----------
  Backport 6.0: Fix creation of a vector symbolObj in mapscript (#4318)


  Commit: 2e17a60cd3c9e615a7f2f9104bdc60bba8198b89
      https://github.com/mapserver/mapserver/commit/2e17a60cd3c9e615a7f2f9104bdc60bba8198b89
  Author: Alan Boudreault <aboudreault at mapgears.com>
  Date:   2012-05-18 (Fri, 18 May 2012)

  Changed paths:
    M HISTORY.TXT
    M mapserver.h

  Log Message:
  -----------
  Preparing 6.0.3 release


  Commit: a686e1404b1f7ca178a2180f8341b35d16c7f6e7
      https://github.com/mapserver/mapserver/commit/a686e1404b1f7ca178a2180f8341b35d16c7f6e7
  Author: Alan Boudreault <aboudreault at mapgears.com>
  Date:   2012-05-18 (Fri, 18 May 2012)

  Changed paths:
    M HISTORY.TXT

  Log Message:
  -----------
  Make HISTORY.TXT ready for next development


  Commit: af7bf80c8bc34644214cc4594770285878777db2
      https://github.com/mapserver/mapserver/commit/af7bf80c8bc34644214cc4594770285878777db2
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M mapwcs20.c

  Log Message:
  -----------
  Made format parameter optional, as long as the 'native_format' can be retrieved (either from the source GDAL dataset or from the metadata).


  Commit: 632741899145d7f858cec79844c33813601394e9
      https://github.com/mapserver/mapserver/commit/632741899145d7f858cec79844c33813601394e9
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M mapwcs20.c

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


  Commit: 786caa1dc2d51305560a04da4bcd129f40ab1186
      https://github.com/mapserver/mapserver/commit/786caa1dc2d51305560a04da4bcd129f40ab1186
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M HISTORY.TXT

  Log Message:
  -----------
  Update HISTORY.TXT.


  Commit: 6d612944919a0ce688f0ce22f3d7af8a502e575d
      https://github.com/mapserver/mapserver/commit/6d612944919a0ce688f0ce22f3d7af8a502e575d
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M HISTORY.TXT
    M mapwcs20.c

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

Conflicts:
	HISTORY.TXT
	mapserver.h


  Commit: fac5e35129168fd006ef9296bc53414cb311e9bd
      https://github.com/mapserver/mapserver/commit/fac5e35129168fd006ef9296bc53414cb311e9bd
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M mapwcs20.c

  Log Message:
  -----------
  Moved nativeFormat element of CoverageDescriptions to the correct place. (#4003).
ServiceMetadata is now a section like the other sections of Capabilities. Not yet conformant with the WCS 2.0 specs but obviously a bug.


  Commit: 765017bcb8bacc99db3e35a376daadce3ecc6be2
      https://github.com/mapserver/mapserver/commit/765017bcb8bacc99db3e35a376daadce3ecc6be2
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M HISTORY.TXT

  Log Message:
  -----------
  Updated HISTORY.TXT


  Commit: 4f7b8dbab963862a30864a1f4069a231a6d72389
      https://github.com/mapserver/mapserver/commit/4f7b8dbab963862a30864a1f4069a231a6d72389
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M HISTORY.TXT
    M classobject.c
    M mapfile.c
    M mapscript/php/class.c
    M mapscript/php/label.c
    M mapscript/php/mapscript_i.c
    M mapscript/php/php_mapscript.h
    M mapscript/swiginc/label.i
    M mapserver.h
    M maptemplate.c

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

Conflicts:
	HISTORY.TXT


  Commit: ddea8ddf1c54d8351d1a444b2b3310565c6dbacf
      https://github.com/mapserver/mapserver/commit/ddea8ddf1c54d8351d1a444b2b3310565c6dbacf
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M HISTORY.TXT
    M classobject.c
    M mapfile.c
    M mapscript/php/class.c
    M mapscript/php/label.c
    M mapscript/php/mapscript_i.c
    M mapscript/php/php_mapscript.h
    M mapscript/swiginc/label.i
    M mapserver.h

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

Conflicts:
	HISTORY.TXT


  Commit: d746adff20b788314f91c6171a69623ae5413c16
      https://github.com/mapserver/mapserver/commit/d746adff20b788314f91c6171a69623ae5413c16
  Author: Fabian Schindler <fabian.schindler at gmx.at>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M HISTORY.TXT
    M mapwcs20.c

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


  Commit: 7b3bf2737a8a3e5096123b655676fda10e243824
      https://github.com/mapserver/mapserver/commit/7b3bf2737a8a3e5096123b655676fda10e243824
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M HISTORY.TXT
    M mapwcs20.c

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

Conflicts:
	HISTORY.TXT


  Commit: bf06d96d4a6ea6ba44e19fbd055b496ae7838bc9
      https://github.com/mapserver/mapserver/commit/bf06d96d4a6ea6ba44e19fbd055b496ae7838bc9
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M .gitignore
    M Makefile.in
    M configure
    M configure.in
    M mapgd.c

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


  Commit: e609e44f89a54421fe77ed20ac46233c4fb65ca6
      https://github.com/mapserver/mapserver/commit/e609e44f89a54421fe77ed20ac46233c4fb65ca6
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M mapwms.c

  Log Message:
  -----------
  Adding INSPIRE ExtendedCapabilities and DOCTYPE definition to WMS 1.1.1.


  Commit: 7e54ebe1796e991fecb3e62bf5a73580e13a8602
      https://github.com/mapserver/mapserver/commit/7e54ebe1796e991fecb3e62bf5a73580e13a8602
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M HISTORY.TXT

  Log Message:
  -----------
  Forgot HITORY.TXT in previous commit.


  Commit: de0dd13242dc3c818d9fc59efd15f8315b6f0033
      https://github.com/mapserver/mapserver/commit/de0dd13242dc3c818d9fc59efd15f8315b6f0033
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M configure
    M configure.in
    M mapcairo.c

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


  Commit: fd7af49fc60bcb20409579bab2800dd50d8a7e76
      https://github.com/mapserver/mapserver/commit/fd7af49fc60bcb20409579bab2800dd50d8a7e76
  Author: Stephan Meissl <stephan at meissl.name>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M HISTORY.TXT
    M mapogcsos.c
    M mapwcs.c
    M mapwcs20.c
    M mapwfs.c
    M mapwms.c

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

Conflicts:
	HISTORY.TXT


Compare: https://github.com/mapserver/mapserver/compare/c9a832e...fd7af49