[pkg-horde] [COMMIT lionel kronolith--sid--2--patch-10] Merge with upstream

Lionel Elie Mamane lmamane at alioth.debian.org
Sun Nov 5 12:05:04 CET 2006


2006-11-05  Lionel Elie Mamane  <lionel at mamane.lu>  patch-10

	* COPYING:
	* attendees.php:
	* config/prefs.php.dist:
	* data.php:
	* debian/changelog:
	* deleventaction.php:
	* docs/CHANGES:
	* docs/CREDITS:
	* docs/INSTALL:
	* docs/RELEASE_NOTES:
	* editeventaction.php:
	* ics.php:
	* js/fixUnstyledOptions.js:
	* lib/Block/monthlist.php:
	* lib/Block/tree_alarms.php:
	* lib/DayView.php:
	* lib/Driver.php:
	* lib/Driver/kolab.php:
	* lib/Driver/sql.php:
	* lib/FBView/week.php:
	* lib/Kronolith.php:
	* lib/Scheduler/kronolith.php:
	* lib/Storage.php:
	* lib/Storage/kolab.php:
	* lib/api.php:
	* lib/base.php:
	* lib/version.php:
	* locale/da_DK/LC_MESSAGES/kronolith.mo:
	* locale/de_DE/LC_MESSAGES/kronolith.mo:
	* locale/el_GR/LC_MESSAGES/kronolith.mo:
	* locale/es_ES/LC_MESSAGES/kronolith.mo:
	* locale/fr_FR/LC_MESSAGES/kronolith.mo:
	* locale/it_IT/LC_MESSAGES/kronolith.mo:
	* locale/ja_JP/LC_MESSAGES/kronolith.mo:
	* locale/nb_NO/LC_MESSAGES/kronolith.mo:
	* locale/nl_NL/LC_MESSAGES/kronolith.mo:
	* locale/pt_BR/LC_MESSAGES/kronolith.mo:
	* locale/zh_TW/LC_MESSAGES/kronolith.mo:
	* month.php:
	* po/da_DK.po:
	* po/de_DE.po:
	* po/el_GR.po:
	* po/es_ES.po:
	* po/it_IT.po:
	* po/ja_JP.po:
	* po/kronolith.pot:
	* po/nl_NL.po:
	* po/pt_BR.po:
	* po/zh_TW.po:
	* scripts/reminders.php:
	* scripts/sql/kronolith.mssql.sql:
	* scripts/sql/kronolith.mysql.sql:
	* scripts/sql/kronolith.oci8.sql:
	* scripts/sql/kronolith.pgsql.sql:
	* scripts/sql/kronolith.sql:
	* scripts/upgrades/1.1_to_2.0.pgsql.sql:
	* scripts/upgrades/2004-05-19_convert_categories_to_strings.php:
	* templates/attendees/attendees.inc:
	* templates/calendars/calendars.inc:
	* templates/category_legend.inc:
	* templates/common-header.inc:
	* templates/edit/edit.inc:
	* templates/edit/edit_timespan.inc:
	* templates/edit/javascript.inc:
	* templates/menu.inc:
	* templates/prefs/remote_cal_management.inc:
	* templates/search/search_advanced.inc:
	+ locale/sl_SI/.arch-ids/=id:
	+ locale/sl_SI/LC_MESSAGES/.arch-ids/=id:
	+ locale/sl_SI/LC_MESSAGES/.arch-ids/kronolith.mo.id:
	+ locale/sl_SI/LC_MESSAGES/kronolith.mo:
	+ po/.arch-ids/sl_SI.po.id:
	+ po/sl_SI.po:
	+ scripts/sql/.arch-ids/kronolith.xml.id:
	+ scripts/sql/kronolith.xml:
	+ scripts/upgrades/.arch-ids/1.1_to_2.0.oci8.sql.id:
	+ scripts/upgrades/.arch-ids/2006-08-20_fix_recur_int_fields.mysql.sql.id:
	+ scripts/upgrades/1.1_to_2.0.oci8.sql:
	+ scripts/upgrades/2006-08-20_fix_recur_int_fields.mysql.sql:
	- templates/day/.arch-ids/row.inc.id:
	- templates/day/.arch-ids/row_half.inc.id:
	- templates/day/row.inc:
	- templates/day/row_half.inc:
	* templates/javascript/.arch-ids/goto.inc.id -> templates/javascript/.arch-ids/goto.js.id:
	* templates/javascript/goto.inc -> templates/javascript/goto.js:

	Merge with upstream

	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/kronolith--upstream--2--patch-3
	   Imported upstream kronolith-h3 2.1.3




More information about the pkg-horde-hackers mailing list