[QGIS Commit] [qgis/QGIS] e745b2: Added notes on merging pull requests based on Matt...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: e745b2ffa5a6f1a249dedba18eded232857097c7
      https://github.com/qgis/QGIS/commit/e745b2ffa5a6f1a249dedba18eded232857097c7
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2014-01-13 (Mon, 13 Jan 2014)

  Changed paths:
    M CODING
    M doc/CODING.t2t

  Log Message:
  -----------
  Added notes on merging pull requests based on Matthias's message in mailing list.


  Commit: 88c73a13c5aa58e2fac4cdab9642354599e1199e
      https://github.com/qgis/QGIS/commit/88c73a13c5aa58e2fac4cdab9642354599e1199e
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2014-01-13 (Mon, 13 Jan 2014)

  Changed paths:
    M src/mapserver/qgis_map_serv.cpp

  Log Message:
  -----------
  Added a little more debug info so show which projects were found and which default was used.


Compare: https://github.com/qgis/QGIS/compare/e3d6236ac29c...88c73a13c5aa