[Dolibarr-git] [Dolibarr/dolibarr] 6b1b6b: Fix: Color no more lost

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6b1b6b4fee9671835db8fc518906e09aed7e2030
      
https://github.com/Dolibarr/dolibarr/commit/6b1b6b4fee9671835db8fc518906e09aed7e2030
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

  Log Message:
  -----------
  Fix: Color no more lost


  Commit: 16d530b22d9ec62fc500334eb13bbd977e65464e
      
https://github.com/Dolibarr/dolibarr/commit/16d530b22d9ec62fc500334eb13bbd977e65464e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Fix: Watermark make pagebreak crazy.


  Commit: fe079f71dadaf1143fa89e209cad4eae8f53ef69
      
https://github.com/Dolibarr/dolibarr/commit/fe079f71dadaf1143fa89e209cad4eae8f53ef69
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4


  Commit: 0aa15731b36dcfba9d269d261350e92d9fef95ae
      
https://github.com/Dolibarr/dolibarr/commit/0aa15731b36dcfba9d269d261350e92d9fef95ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.4_backported

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3665a1a07a4e...0aa15731b36d