Doug Turner 02a7000526 Merge. manually merged. modules/plugin/test/testplugin/nptest.cpp, testing/xpcshell/head.js.		2010-03-10 19:13:35 -08:00
..
app	Bug 546492 - Provide a resource description for mozilla-runtime.exe, r=ted with altered text suggested by dolske	2010-02-24 11:41:34 -05:00
chromium	Bug 544190 - QCore version needed to replace message_pump_glib.cc. r=dougt	2010-02-18 23:48:50 +02:00
glue	Merge. manually merged. modules/plugin/test/testplugin/nptest.cpp, testing/xpcshell/head.js.	2010-03-10 19:13:35 -08:00
ipdl	b=550026 Don't call PluginCrashed while plugin code is still on the stack r=bsmedberg	2010-03-08 09:16:02 +13:00
testshell	Fix some merge bustage.	2010-03-08 14:16:41 -06:00
Makefile.in	Merge	2010-03-01 15:36:51 -08:00
pull-chromium.py