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
..
components	bug 561451 - Build alerts service on android r=vlad	2010-05-11 13:27:36 -04:00
content	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
crashreporter	Bug 557011: Ensure OOP crashreporter has been initialized on mac. r=bsmedberg	2010-04-12 15:47:47 -05:00
library	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
locales	Bug 563168: Blocklist service warns of bad add-ons, but nothing is listed. r=robstrong	2010-05-06 12:57:58 -07:00
mozapps	Bug 562583: test_update.js in the addonsmgr branch fails randomly. a=mossop	2010-05-10 13:29:57 -07:00
obsolete	Bug 523693 Inline spell checker shouuld be a module r=gavin (new/renamed files)	2009-10-28 11:19:03 +00:00
profile	Use Unicode paths instead of native paths for profile directory on platforms where native paths are not UTF-8. Bug 534854, r=ted	2010-02-23 12:19:15 +02:00
spatial-navigation	Bug 507387 - fix copyright holder; Mozilla Corporation -> Mozilla Foundation. r=gerv.	2009-12-21 21:50:30 +00:00
system	Bug 538028 - nsIAlertsService::showAlertNotification with null title shows short (1px tall) alerts on Linux. r=roc	2010-01-20 11:22:54 +01:00
themes	Bug 562847: extensions.css font-size: 120% is not terminated. r=dtownsend	2010-05-05 09:55:53 -07:00
xre	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
Makefile.in	Bug 549637: don't build toolkit and toolkit/components separately, r=ted	2010-03-02 10:11:01 -08:00
empty-file	…
toolkit-makefiles.sh	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00
toolkit-tiers.mk	merge with m-c. resolved conflicts in:	2010-05-11 11:09:54 -07:00