[pkg-horde] [COMMIT lionel nag--sid--2--patch-8] Merge with upstream

Lionel Elie Mamane lmamane at costa.debian.org
Tue May 9 20:15:03 UTC 2006


2006-05-09  Lionel Elie Mamane  <lionel at mamane.lu>  patch-8

	* templates/list/task_footers.inc:
	+ .arch-ids/ics.php.id:
	+ ics.php:
	+ js/.arch-ids/=id:
	+ js/.arch-ids/fixUnstyledOptions.js.id:
	+ js/.arch-ids/tables.js.id:
	+ js/fixUnstyledOptions.js:
	+ js/tables.js:
	+ locale/pt_PT/.arch-ids/=id:
	+ locale/pt_PT/LC_MESSAGES/.arch-ids/=id:
	+ locale/pt_PT/LC_MESSAGES/.arch-ids/nag.mo.id:
	+ locale/pt_PT/LC_MESSAGES/nag.mo:
	+ locale/tr_TR/.arch-ids/=id:
	+ locale/tr_TR/.arch-ids/help.xml.id:
	+ locale/tr_TR/help.xml:
	+ po/.arch-ids/pt_PT.po.id:
	+ po/pt_PT.po:
	+ scripts/.arch-ids/import_vtodos.php.id:
	+ scripts/import_vtodos.php:
	+ scripts/sql/.arch-ids/nag.mssql.sql.id:
	+ scripts/sql/.arch-ids/nag.oci8.sql.id:
	+ scripts/sql/nag.mssql.sql:
	+ scripts/sql/nag.oci8.sql:
	+ themes/.arch-ids/categoryCSS.php.id:
	+ themes/categoryCSS.php:
	+ themes/graphics/.arch-ids/az.png.id:
	+ themes/graphics/.arch-ids/za.png.id:
	+ themes/graphics/az.png:
	+ themes/graphics/za.png:
	- .arch-ids/ics.php.id:
	- ics.php:
	- js/.arch-ids/=id:
	- js/.arch-ids/fixUnstyledOptions.js.id:
	- js/.arch-ids/tables.js.id:
	- js/fixUnstyledOptions.js:
	- js/tables.js:
	- locale/pt_PT/.arch-ids/=id:
	- locale/pt_PT/LC_MESSAGES/.arch-ids/=id:
	- locale/pt_PT/LC_MESSAGES/.arch-ids/nag.mo.id:
	- locale/pt_PT/LC_MESSAGES/nag.mo:
	- locale/tr_TR/.arch-ids/=id:
	- locale/tr_TR/.arch-ids/help.xml.id:
	- locale/tr_TR/help.xml:
	- po/.arch-ids/pt_PT.po.id:
	- po/pt_PT.po:
	- scripts/.arch-ids/import_vtodos.php.id:
	- scripts/import_vtodos.php:
	- scripts/sql/.arch-ids/nag.mssql.sql.id:
	- scripts/sql/.arch-ids/nag.oci8.sql.id:
	- scripts/sql/nag.mssql.sql:
	- scripts/sql/nag.oci8.sql:
	- themes/.arch-ids/categoryCSS.php.id:
	- themes/categoryCSS.php:
	- themes/graphics/.arch-ids/az.png.id:
	- themes/graphics/.arch-ids/za.png.id:
	- themes/graphics/az.png:
	- themes/graphics/za.png:

	Merge with upstream

	Repair the mess I made by importing Jose's upload directly into the
	sid branch.


	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/nag--upstream--2--patch-2
	   Imported nag-h3-2.1




More information about the pkg-horde-hackers mailing list