[Dolibarr-git] [Dolibarr/dolibarr] 149dc1: cvsimport

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 149dc12da052650afc37496d93f9e46295bd7ff2
      
https://github.com/Dolibarr/dolibarr/commit/149dc12da052650afc37496d93f9e46295bd7ff2
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-19 (Mon, 19 Sep 2011)

  Changed paths:
    M .cvsignore
  M .gitignore
  A build/.gitignore
  M build/makepack-dolibarr.pl
  R default.properties

  Log Message:
  -----------
  cvsimport

Conflicts:
        .gitignore


  Commit: 71ec6bf73b3334866558c5246ec797cec0ba43a8
      
https://github.com/Dolibarr/dolibarr/commit/71ec6bf73b3334866558c5246ec797cec0ba43a8
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-19 (Mon, 19 Sep 2011)

  Changed paths:
    M build.xml
  M build/doxygen/hudson-doxygen.doxyfile

  Log Message:
  -----------
  Merge branch 'develop' of git+ssh://github.com/Dolibarr/dolibarr into develop


Compare: https://github.com/Dolibarr/dolibarr/compare/ea260f8...71ec6bf