[Dolibarr-git] [Dolibarr/dolibarr] 7ee0f8: Pull Dolibarr/develop

[Regis Houssin]

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

  Commit: 7ee0f8a6a08be1f4d15a47ebc63b831fb8d4f5d0
      
https://github.com/Dolibarr/dolibarr/commit/7ee0f8a6a08be1f4d15a47ebc63b831fb8d4f5d0
  Author: Herve Prot <address@hidden>
  Date:   2011-09-22 (Thu, 22 Sep 2011)

  Changed paths:
    M build/doxygen/doxygen_footer.html
  M htdocs/admin/dict.php
  M htdocs/cashdesk/include/environnement.php
  M htdocs/comm/action/class/actioncomm.class.php
  M htdocs/comm/action/class/cactioncomm.class.php
  M htdocs/compta/ajaxpayment.php
  M htdocs/includes/modules/modDocument.class.php
  M htdocs/includes/modules/modExpedition.class.php
  M htdocs/includes/modules/modFicheinter.class.php
  M htdocs/includes/modules/modLabel.class.php
  M htdocs/includes/modules/modMailing.class.php
  M htdocs/lib/admin.lib.php
  M htdocs/theme/auguria/ckeditor/config.js
  R htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/bureau2crea/ckeditor/config.js
  R htdocs/theme/bureau2crea/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/cameleo/ckeditor/config.js
  R htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/eldy/ckeditor/config.js
  R htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/phones/smartphone/theme/default/default.css.php

  Log Message:
  -----------
  Pull Dolibarr/develop


  Commit: 7d093365563278ca3c10d7ffee6f0e25f6d9c543
      
https://github.com/Dolibarr/dolibarr/commit/7d093365563278ca3c10d7ffee6f0e25f6d9c543
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-22 (Thu, 22 Sep 2011)

  Changed paths:
    M build/doxygen/doxygen_footer.html
  M htdocs/admin/dict.php
  M htdocs/cashdesk/include/environnement.php
  M htdocs/comm/action/class/actioncomm.class.php
  M htdocs/comm/action/class/cactioncomm.class.php
  M htdocs/compta/ajaxpayment.php
  M htdocs/includes/modules/modDocument.class.php
  M htdocs/includes/modules/modExpedition.class.php
  M htdocs/includes/modules/modFicheinter.class.php
  M htdocs/includes/modules/modLabel.class.php
  M htdocs/includes/modules/modMailing.class.php
  M htdocs/lib/admin.lib.php
  M htdocs/theme/auguria/ckeditor/config.js
  R htdocs/theme/auguria/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/bureau2crea/ckeditor/config.js
  R htdocs/theme/bureau2crea/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/cameleo/ckeditor/config.js
  R htdocs/theme/cameleo/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/eldy/ckeditor/config.js
  R htdocs/theme/eldy/fckeditor/fck_dialog_ie6.js
  M htdocs/theme/phones/smartphone/theme/default/default.css.php

  Log Message:
  -----------
  Merge remote branch 'dolibarr/develop' into develop

Conflicts:
        htdocs/admin/dict.php


  Commit: a95f3074715414978cc636420eb3e29e9d4dc486
      
https://github.com/Dolibarr/dolibarr/commit/a95f3074715414978cc636420eb3e29e9d4dc486
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-22 (Thu, 22 Sep 2011)

  Changed paths:
    M htdocs/admin/perms.php
  R htdocs/conf/.cvsignore
  M htdocs/core/class/conf.class.php
  M htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt
  M htdocs/install/mysql/tables/llx_export_model.key.sql
  M htdocs/main.inc.php
  M htdocs/theme/cameleo/style.css.php
  M htdocs/theme/eldy/img/object_sending.png
  M htdocs/theme/yellow/style.css.php
  M htdocs/user/class/user.class.php
  M htdocs/user/fiche.php
  M htdocs/user/group/fiche.php
  M htdocs/user/group/perms.php
  M htdocs/user/index.php

  Log Message:
  -----------
  Merge commit 'symeos/develop' into develop

Conflicts:
        build.xml


Compare: https://github.com/Dolibarr/dolibarr/compare/f11e77d...a95f307