[Dolibarr-git] [Dolibarr/dolibarr] a519df: Merge branch 'develop' of address@hidden:Dolibarr/...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a519df5d00da565e65054f795d51ec93f9f0575a
      
https://github.com/Dolibarr/dolibarr/commit/a519df5d00da565e65054f795d51ec93f9f0575a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M htdocs/theme/.gitignore

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop


  Commit: c9db04985e475cc9b80aba244ec9f9b77add538c
      
https://github.com/Dolibarr/dolibarr/commit/c9db04985e475cc9b80aba244ec9f9b77add538c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M htdocs/theme/eldy/img/menus/agenda.png
    A htdocs/theme/eldy/img/menus/agenda_over.png
    M htdocs/theme/eldy/img/menus/bank.png
    A htdocs/theme/eldy/img/menus/bank_over.png
    M htdocs/theme/eldy/img/menus/commercial.png
    A htdocs/theme/eldy/img/menus/commercial_over.png
    M htdocs/theme/eldy/img/menus/company.png
    A htdocs/theme/eldy/img/menus/company_over.png
    R htdocs/theme/eldy/img/menus/cron.png
    M htdocs/theme/eldy/img/menus/ecm.png
    A htdocs/theme/eldy/img/menus/ecm_over.png
    M htdocs/theme/eldy/img/menus/externalsite.png
    A htdocs/theme/eldy/img/menus/externalsite_over.png
    A htdocs/theme/eldy/img/menus/ftp.png
    A htdocs/theme/eldy/img/menus/ftp_over.png
    M htdocs/theme/eldy/img/menus/generic1.png
    A htdocs/theme/eldy/img/menus/generic1_over.png
    M htdocs/theme/eldy/img/menus/generic2.png
    A htdocs/theme/eldy/img/menus/generic2_over.png
    M htdocs/theme/eldy/img/menus/generic3.png
    A htdocs/theme/eldy/img/menus/generic3_over.png
    M htdocs/theme/eldy/img/menus/generic4.png
    A htdocs/theme/eldy/img/menus/generic4_over.png
    M htdocs/theme/eldy/img/menus/globe.png
    A htdocs/theme/eldy/img/menus/globe_over.png
    M htdocs/theme/eldy/img/menus/holiday.png
    M htdocs/theme/eldy/img/menus/home.png
    A htdocs/theme/eldy/img/menus/home_over.png
    M htdocs/theme/eldy/img/menus/mail.png
    A htdocs/theme/eldy/img/menus/mail_over.png
    M htdocs/theme/eldy/img/menus/members.png
    A htdocs/theme/eldy/img/menus/members_over.png
    M htdocs/theme/eldy/img/menus/money.png
    A htdocs/theme/eldy/img/menus/money_over.png
    M htdocs/theme/eldy/img/menus/pointofsale.png
    A htdocs/theme/eldy/img/menus/pointofsale_over.png
    M htdocs/theme/eldy/img/menus/products.png
    A htdocs/theme/eldy/img/menus/products_over.png
    M htdocs/theme/eldy/img/menus/project.png
    A htdocs/theme/eldy/img/menus/project_over.png
    A htdocs/theme/eldy/img/menus/shop.png
    A htdocs/theme/eldy/img/menus/shop_over.png
    M htdocs/theme/eldy/img/menus/tools.png
    A htdocs/theme/eldy/img/menus/tools_over.png
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  Update image for menu


  Commit: 90d275bd2068a568691481a3d2ae2debd9555f81
      
https://github.com/Dolibarr/dolibarr/commit/90d275bd2068a568691481a3d2ae2debd9555f81
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M htdocs/core/modules/modDynamicPrices.class.php

  Log Message:
  -----------
  Fix comment


Compare: 
https://github.com/Dolibarr/dolibarr/compare/348e8295949a...90d275bd2068