[mapserver-commits] [mapserver/mapserver] 74ce45: add gitignore

[GitHub]

  Branch: refs/heads/branch-4-10
  Home:   https://github.com/mapserver/mapserver
  Commit: 74ce456aabdd9e01b2784d85acce3a06b4354fd5
      https://github.com/mapserver/mapserver/commit/74ce456aabdd9e01b2784d85acce3a06b4354fd5
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A .gitignore

  Log Message:
  -----------
  add gitignore


  Commit: 6dd48cd3168df6e8f29dd64454deb293de0f784a
      https://github.com/mapserver/mapserver/commit/6dd48cd3168df6e8f29dd64454deb293de0f784a
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A stablemerge.sh

  Log Message:
  -----------
  add script to recursively apply stable fixes to newer branches


  Commit: 3e0c28c749ac098c32cc785100112938d1c58878
      https://github.com/mapserver/mapserver/commit/3e0c28c749ac098c32cc785100112938d1c58878
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  add files to ignore


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

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  correct test for git merge return value


  Commit: 9fb3b6f922440eef194ebf02a54cfb0dd65f4b2e
      https://github.com/mapserver/mapserver/commit/9fb3b6f922440eef194ebf02a54cfb0dd65f4b2e
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M stablemerge.sh

  Log Message:
  -----------
  fix again


Compare: https://github.com/mapserver/mapserver/compare/efd3989...9fb3b6f