[mapserver-commits] [mapserver/mapserver] 4caf2b: fix for recent swig builds (#4325)

[GitHub]

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

  Changed paths:
    M maperror.h
    M mapserver.h
    M mapsymbol.h

  Log Message:
  -----------
  fix for recent swig builds (#4325)


  Commit: cea9173904ff70e8266d18b3f368978a599a58e7
      https://github.com/mapserver/mapserver/commit/cea9173904ff70e8266d18b3f368978a599a58e7
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M maperror.h
    M mapserver.h
    M mapsymbol.h
    M maptemplate.c

  Log Message:
  -----------
  Merge branch 'swig-fixes' of https://github.com/tbonfort/mapserver


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

  Changed paths:
    M mapscript/mapscript.i

  Log Message:
  -----------
  s/layer_obj/layerObj for mapscript


  Commit: aaed141b1b0c9698a4931fc149f56218ae3f513c
      https://github.com/mapserver/mapserver/commit/aaed141b1b0c9698a4931fc149f56218ae3f513c
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M mapscript/mapscript.i

  Log Message:
  -----------
  Merge branch 'swig-fixes' of https://github.com/tbonfort/mapserver


  Commit: 2aedaba2b1726b60537098a4dc0b2543e53bccac
      https://github.com/mapserver/mapserver/commit/2aedaba2b1726b60537098a4dc0b2543e53bccac
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-10-18 (Thu, 18 Oct 2012)

  Changed paths:
    M .gitignore
    M mapcairo.c
    M mapfile.c
    M mapprimitive.c
    M mapscript/java/javamodule.i
    M mapscript/python/tests/cases/imagetest.py
    M mapscript/python/tests/cases/threadtest.py
    M mapscript/ruby/extconf.rb
    M mapserver.h
    M mapwms.c
    M msautotest
    M tests/test.map

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


  Commit: f934065351214bee712541238bb269e6f565514b
      https://github.com/mapserver/mapserver/commit/f934065351214bee712541238bb269e6f565514b
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-10-23 (Tue, 23 Oct 2012)

  Changed paths:
    M HISTORY.TXT
    M mapuvraster.c
    M mapwcs.c
    M mapwfs.c
    M msautotest

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


  Commit: 46a9c0c427263afcbc2f351c6d6a1bd32c09ece5
      https://github.com/mapserver/mapserver/commit/46a9c0c427263afcbc2f351c6d6a1bd32c09ece5
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-11-06 (Tue, 06 Nov 2012)

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

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


  Commit: 2fb006da6758b5537bcc234583fb4e058d60657a
      https://github.com/mapserver/mapserver/commit/2fb006da6758b5537bcc234583fb4e058d60657a
  Author: Umberto Nicoletti <umberto.nicoletti at gmail.com>
  Date:   2012-11-06 (Tue, 06 Nov 2012)

  Changed paths:
    M maporaclespatial.c

  Log Message:
  -----------
  Rolled back bc4ccf09b9450b30a2bfcdbf0fb4ec20cd53fc7c to fix pagination loop issue #4508 with oracle spatial layers


Compare: https://github.com/mapserver/mapserver/compare/5d73833c7849...2fb006da6758