[Dolibarr-git] [Dolibarr/dolibarr] 8b4197: Prepare upgrade of doliwamp

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8b41970b2efa522b40143b530f9f45d1b2c5d146
      
https://github.com/Dolibarr/dolibarr/commit/8b41970b2efa522b40143b530f9f45d1b2c5d146
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Prepare upgrade of doliwamp


  Commit: 1af8ca458d90d8728a75b68b51613e39a3a1473b
      
https://github.com/Dolibarr/dolibarr/commit/1af8ca458d90d8728a75b68b51613e39a3a1473b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M build/exe/doliwamp/doliwamp.bmp
    M build/exe/doliwamp/doliwamp.iss
    M build/exe/doliwamp/my.ini.install

  Log Message:
  -----------
  Better image

Conflicts:
        build/exe/doliwamp/doliwamp.bmp


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b4e5acbaa90f...1af8ca458d90