Doug Turner 0dc0f3273e 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
..
crashtests	bug 327524 - crash test by Martijn Wargers.	2009-04-24 10:08:11 -07:00
public	merging	2010-01-05 23:50:02 +01:00
src	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
tests	Bug 544097 Chaning mochitests to run against mochi.test instead of localhost r=ted, waldo, dwitte p=jmaher. Landed on CLOSED TREE	2010-03-12 13:53:36 -08:00
Makefile.in	Bug 495387 - A few naughty things build their tests without ENABLE_TESTS, security tests fix, r=jwalden, a=beltzner	2009-08-06 16:29:26 +02:00