Dan Stillman 6408762b12 Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch		2008-05-16 09:14:11 +00:00
..
about.dtd	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
preferences.dtd	Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch	2008-05-16 09:14:11 +00:00
searchbox.dtd	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
timeline.properties	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
zotero.dtd	Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch	2008-05-16 09:14:11 +00:00
zotero.properties	Merged revisions 2640-2647,2651,2653-2654,2656-2658,2660-2667,2670-2672,2674-2677,2680,2683-2684,2687-2704,2707 to trunk via svnmerge from 1.0 branch	2008-05-16 09:14:11 +00:00