Doug Turner 16e2fd5fe7 Merge. manually merged. modules/plugin/test/testplugin/nptest.cpp, testing/xpcshell/head.js.		2010-03-10 19:13:35 -08:00
..
base	Merge. manually merged. modules/plugin/test/testplugin/nptest.cpp, testing/xpcshell/head.js.	2010-03-10 19:13:35 -08:00
interfaces	Merge with mc	2010-03-08 10:09:55 -08:00
ipc	Bug 549693 - [E10s] addMessageListener callback object should have access to browser object, r=jst	2010-03-05 13:00:43 +02:00
locales	Bug 548481 - about:plugins page title should be "Enabled Plugins", not "Installed Plugins". ui-r=faaborg, r=josh	2010-03-09 08:49:22 +01:00
plugins	Merge with mc	2010-03-08 10:09:55 -08:00
public/coreEvents	Bug 528435 Drop NS_COMPOSITION_QUERY event r=roc, sr=neil	2009-11-16 22:13:02 +09:00
src	Bug 441324, part 1: Shuffle around includes to avoid problems with #define malloc et al. r=bsmedberg	2010-03-03 23:02:55 -06:00
tests	Backout changes to .jar files missed from previous backout of bug 544097	2010-03-10 09:51:28 +00:00
dom-config.mk	Bug 521673 - Remove remnant OJI references; (Dv1) /dom/dom-config.mk: remove obsolete REQUIRES.	2010-03-09 01:02:26 +01:00
Makefile.in	Electrolysis-plugin-only bookkeeping commit.	2009-12-15 20:33:05 -05:00