Edward Lee c29ee791ce Resolve commit conflicts from merging in weave.		2009-08-19 22:53:04 -07:00
..
locales/en-US	bug 481733 - provide better error messages, handle errors better, make autoconnect more robust, r=edilee	2009-08-19 23:27:22 -04:00
modules	Resolve commit conflicts from merging in weave.	2009-08-19 22:53:04 -07:00
tests/unit	Handle holes in bookmark folders and fix up bookmarks to be at an earlier position if a hole was detected.	2009-08-19 19:32:05 -07:00
services-sync.js	Bug 504230 - Use Engine's logging level for Store and Tracker	2009-07-14 18:34:03 -07:00
Weave.js	initial commit of new about:weave	2009-08-18 20:03:11 -07:00