diff --git a/htdocs/conf/.cvsignore b/htdocs/conf/.cvsignore deleted file mode 100644 index ff44c5dfae444..0000000000000 --- a/htdocs/conf/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -conf.php*.sav -*.php -conf.php.mysql -conf.php.postgres diff --git a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt index 16a850a1fddf0..114524be6d8fb 100644 --- a/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt +++ b/htdocs/includes/odtphp/zip/pclzip/gnu-lgpl.txt @@ -269,8 +269,6 @@ Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or - - 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit diff --git a/htdocs/install/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql index 658a1700eefba..bfafd0773b640 100644 --- a/htdocs/install/mysql/tables/llx_export_model.key.sql +++ b/htdocs/install/mysql/tables/llx_export_model.key.sql @@ -1,7 +1,6 @@ -- =================================================================== -- Copyright (C) 2007-2011 Laurent Destailleur -- Copyright (C) 2007 Regis Houssin --- Copyright (C) 2011 Laurent Destailleur -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/htdocs/theme/eldy/img/object_sending.png b/htdocs/theme/eldy/img/object_sending.png index 2a938862d7534..efda8cc7262c9 100644 Binary files a/htdocs/theme/eldy/img/object_sending.png and b/htdocs/theme/eldy/img/object_sending.png differ diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php index 49e5657e20d57..33a94aef8f93e 100644 --- a/htdocs/theme/yellow/style.css.php +++ b/htdocs/theme/yellow/style.css.php @@ -1654,4 +1654,4 @@ close(); -?> +?> \ No newline at end of file