Doug Turner fe405e740c merge with m-c. resolved conflicts in: ... U chrome/src/nsChromeRegistry.cpp U content/base/src/Makefile.in U dom/base/nsDOMClassInfo.cpp U toolkit/toolkit-tiers.mk --HG-- rename : toolkit/mozapps/extensions/test/unit/test_bug541420.js => toolkit/mozapps/extensions/test/xpcshell/test_bug541420.js		2010-05-11 11:09:54 -07:00
..
public	Bug 536650 - Cookie values not saved for pages loaded from file://; part 2: deal with empty hosts in the	2010-01-12 10:29:20 -08:00
src	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
test/unit_ipc	Bug 537156 - [e10s] Implement cookies. r=jduell,sdwilsh; sr=bz	2010-03-25 16:02:28 -07:00
Makefile.in