| commit | 3070164b5e50f0894d3dfd0eb90aa4de9a5e1547 | |
| author | Jim Mathies <jmathies@mozilla.com> | |
| Fri, 16 Jul 2010 02:47:52 +0000 (15 21:47 -0500) | ||
| committer | Jim Mathies <jmathies@mozilla.com> | |
| Fri, 16 Jul 2010 02:47:52 +0000 (15 21:47 -0500) | ||
| tree | aa43b35099fba46b24f058fac313df2724f87f90 | treesnapshot (tar.gz zip) |
| parent | f3e8db12be286e3dcc7a7c224276adecf0e259c1 | commitdiff |
| parent | 72c9f08e5d8d0fc605782a9646bd66472dedf480 | commitdiff |
merge
176 files changed:
| browser/components/places/public/Makefile.in | blob1 | blob2 | history |
| browser/components/places/public/nsIPlacesTransactionsService.idl | blob1 | blob2 | history |
| browser/components/places/src/nsPlacesTransactionsService.js | blob1 | blob2 | history |
| browser/themes/gnomestripe/browser/Geo.png | blob1 | blob2 | history |
| browser/themes/pinstripe/browser/Geo.png | blob1 | blob2 | history |
| browser/themes/winstripe/browser/Geo-aero.png | blob1 | blob2 | history |
| browser/themes/winstripe/browser/Geo.png | blob1 | blob2 | history |
| chrome/src/nsChromeFactory.cpp | blob1 | blob2 | history |
| content/html/document/test/test_bug386495.html | blob1 | blob2 | history |
| docshell/base/nsGlobalHistory2Adapter.cpp | blob1 | blob2 | history |
| docshell/base/nsGlobalHistory2Adapter.h | blob1 | blob2 | history |
| docshell/base/nsGlobalHistoryAdapter.cpp | blob1 | blob2 | history |
| docshell/base/nsGlobalHistoryAdapter.h | blob1 | blob2 | history |
| dom/indexedDB/IDBCursorRequest.cpp | blob1 | blob2 | history |
| dom/indexedDB/IDBCursorRequest.h | blob1 | blob2 | history |
| dom/indexedDB/IDBDatabaseRequest.cpp | blob1 | blob2 | history |
| dom/indexedDB/IDBDatabaseRequest.h | blob1 | blob2 | history |
| dom/indexedDB/IDBIndexRequest.cpp | blob1 | blob2 | history |
| dom/indexedDB/IDBIndexRequest.h | blob1 | blob2 | history |
| dom/indexedDB/IDBObjectStoreRequest.cpp | blob1 | blob2 | history |
| dom/indexedDB/IDBObjectStoreRequest.h | blob1 | blob2 | history |
| dom/indexedDB/IDBTransactionRequest.cpp | blob1 | blob2 | history |
| dom/indexedDB/IDBTransactionRequest.h | blob1 | blob2 | history |
| dom/indexedDB/IndexedDatabaseRequest.cpp | blob1 | blob2 | history |
| dom/indexedDB/IndexedDatabaseRequest.h | blob1 | blob2 | history |
| dom/indexedDB/nsIIDBCursorRequest.idl | blob1 | blob2 | history |
| dom/indexedDB/nsIIDBDatabaseRequest.idl | blob1 | blob2 | history |
| dom/indexedDB/nsIIDBIndexRequest.idl | blob1 | blob2 | history |
| dom/indexedDB/nsIIDBObjectStoreRequest.idl | blob1 | blob2 | history |
| dom/indexedDB/nsIIDBTransactionRequest.idl | blob1 | blob2 | history |
| dom/indexedDB/nsIIndexedDatabaseRequest.idl | blob1 | blob2 | history |
| dom/src/geolocation/NetworkGeolocationProvider.js | diff1 | diff2 | blobhistory |
| gfx/idl/Makefile.in | blob1 | blob2 | history |
| gfx/idl/geniid.pl | blob1 | blob2 | history |
| gfx/layers/opengl/glDefs.h | blob1 | blob2 | history |
| gfx/public/Makefile.in | blob1 | blob2 | history |
| gfx/public/nsCoord.h | blob1 | blob2 | history |
| gfx/public/nsFont.h | blob1 | blob2 | history |
| gfx/public/nsITheme.h | blob1 | blob2 | history |
| gfx/src/psshared/Makefile.in | blob1 | blob2 | history |
| gfx/src/psshared/nsCUPSShim.h | blob1 | blob2 | history |
| gfx/src/psshared/nsPSPrinters.h | blob1 | blob2 | history |
| gfx/src/psshared/nsPaperPS.h | blob1 | blob2 | history |
| gfx/src/psshared/psSharedCore.h | blob1 | blob2 | history |
| gfx/thebes/public/GLContext.h | blob1 | blob2 | history |
| gfx/thebes/public/GLDefs.h | blob1 | blob2 | history |
| gfx/thebes/public/Makefile.in | blob1 | blob2 | history |
| gfx/thebes/public/gfxContext.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxFont.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxFontUtils.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxGdkNativeRenderer.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxMatrix.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxPlatformGtk.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxQtNativeRenderer.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxSharedImageSurface.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxTypes.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxUserFontSet.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxUtils.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxWindowsSurface.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxXlibNativeRenderer.h | blob1 | blob2 | history |
| gfx/thebes/public/gfxXlibSurface.h | blob1 | blob2 | history |
| gfx/thebes/src/GLContext.cpp | blob1 | blob2 | history |
| gfx/thebes/src/GLContextProviderCGL.mm | blob1 | blob2 | history |
| gfx/thebes/src/GLContextProviderEGL.cpp | blob1 | blob2 | history |
| gfx/thebes/src/GLContextProviderGLX.cpp | blob1 | blob2 | history |
| gfx/thebes/src/GLContextProviderWGL.cpp | blob1 | blob2 | history |
| gfx/thebes/src/Makefile.in | blob1 | blob2 | history |
| gfx/thebes/src/cairo-gdk-utils.h | blob1 | blob2 | history |
| gfx/thebes/src/cairo-xlib-utils.c | blob1 | blob2 | history |
| gfx/thebes/src/gfxAndroidPlatform.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxContext.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxFT2Fonts.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxFont.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxFontUtils.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxGDIFont.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxGDIFontList.h | blob1 | blob2 | history |
| gfx/thebes/src/gfxGdkNativeRenderer.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxHarfBuzzShaper.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxHarfBuzzShaper.h | blob1 | blob2 | history |
| gfx/thebes/src/gfxMacFont.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxMacFont.h | blob1 | blob2 | history |
| gfx/thebes/src/gfxMacPlatformFontList.h | blob1 | blob2 | history |
| gfx/thebes/src/gfxPangoFonts.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxPlatformGtk.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxQtNativeRenderer.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxQtPlatform.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxSharedImageSurface.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxUserFontSet.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxWindowsNativeDrawing.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxWindowsPlatform.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxWindowsSurface.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxXlibNativeRenderer.cpp | blob1 | blob2 | history |
| gfx/thebes/src/gfxXlibSurface.cpp | blob1 | blob2 | history |
| intl/chardet/public/nsIMetaCharsetService.h | blob1 | blob2 | history |
| intl/chardet/public/nsIXMLEncodingService.h | blob1 | blob2 | history |
| intl/chardet/src/nsDetectionAdaptor.cpp | blob1 | blob2 | history |
| intl/chardet/src/nsDetectionAdaptor.h | blob1 | blob2 | history |
| intl/chardet/src/nsMetaCharsetObserver.cpp | blob1 | blob2 | history |
| intl/chardet/src/nsMetaCharsetObserver.h | blob1 | blob2 | history |
| intl/chardet/src/nsXMLEncodingObserver.cpp | blob1 | blob2 | history |
| intl/chardet/src/nsXMLEncodingObserver.h | blob1 | blob2 | history |
| intl/uconv/public/nsICharRepresentable.h | blob1 | blob2 | history |
| intl/unicharutil/util/gensymmtable.pl | blob1 | blob2 | history |
| intl/unicharutil/util/nsCompressedCharMap.cpp | blob1 | blob2 | history |
| intl/unicharutil/util/symmtable.h | blob1 | blob2 | history |
| js/src/xpconnect/tests/unit/CatRegistrationComponents.js | blob1 | blob2 | history |
| layout/base/nsDocumentViewer.cpp | diff1 | diff2 | blobhistory |
| modules/libjar/nsXPTZipLoader.cpp | blob1 | blob2 | history |
| modules/libjar/nsXPTZipLoader.h | blob1 | blob2 | history |
| rdf/build/nsRDFModule.h | blob1 | blob2 | history |
| toolkit/components/filepicker/src/nsFilePicker.js.in | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/mac/sender/Breakpad.nib/classes.nib | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/mac/sender/Breakpad.nib/info.nib | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/mac/sender/Breakpad.nib/keyedobjects.nib | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.nib/classes.nib | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.nib/info.nib | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/mac/testapp/English.lproj/MainMenu.nib/keyedobjects.nib | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/windows/breakpad_client.sln | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/crash_generation.vcproj | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler.vcproj | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler_test/exception_handler_test.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/windows/handler/exception_handler_test/exception_handler_test.vcproj | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/client/windows/sender/crash_report_sender.vcproj | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dump_stabs.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dump_stabs.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dump_stabs_unittest.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_cfi_to_module.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_cfi_to_module.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_cfi_to_module_unittest.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_cu_to_module.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_cu_to_module.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_cu_to_module_unittest.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_line_to_module.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_line_to_module.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/dwarf_line_to_module_unittest.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/language.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/module.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/module.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/module_unittest.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/stabs_reader.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/stabs_reader.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/stabs_reader_unittest.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/testdata/stabs_reader_unittest.input1 | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/testdata/stabs_reader_unittest.input2 | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/testdata/stabs_reader_unittest.input3 | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/testdata/stabs_reader_unittest.input4 | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/testdata/stabs_reader_unittest.input5 | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/common/linux/testdata/stabs_reader_unittest.input6 | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/processor/test_assembler.cc | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/processor/test_assembler.h | blob1 | blob2 | history |
| toolkit/crashreporter/google-breakpad/src/processor/test_assembler_unittest.cc | blob1 | blob2 | history |
| toolkit/mozapps/plugins/pluginGlue.js | blob1 | blob2 | history |
| xpcom/components/nsIComponentManagerObsolete.idl | blob1 | blob2 | history |
| xpcom/components/nsIModuleLoader.idl | blob1 | blob2 | history |
| xpcom/components/nsIServiceManagerObsolete.h | blob1 | blob2 | history |
| xpcom/components/nsModule.h | blob1 | blob2 | history |
| xpcom/components/nsObsoleteModuleLoading.h | blob1 | blob2 | history |
| xpcom/components/nsServiceManagerObsolete.cpp | blob1 | blob2 | history |
| xpcom/components/nsStaticComponentLoader.cpp | blob1 | blob2 | history |
| xpcom/components/nsStaticComponentLoader.h | blob1 | blob2 | history |
| xpcom/glue/nsGenericFactory.cpp | blob1 | blob2 | history |
| xpcom/glue/nsGenericFactory.h | blob1 | blob2 | history |
| xpcom/glue/nsIGenericFactory.h | blob1 | blob2 | history |
| xpcom/reflect/xptinfo/public/nsIXPTLoader.idl | blob1 | blob2 | history |
| xpcom/reflect/xptinfo/src/xptiMisc.cpp | blob1 | blob2 | history |
| xpcom/tests/TestFactory.cpp | blob1 | blob2 | history |
| xpcom/tests/TestFactory.h | blob1 | blob2 | history |
| xpcom/tests/TestServMgr.cpp | blob1 | blob2 | history |
| xpcom/tests/dynamic/Makefile.in | blob1 | blob2 | history |
| xpcom/tests/dynamic/TestDynamic.cpp | blob1 | blob2 | history |
| xpcom/tests/regorder/core/componentDeferred.js | blob1 | blob2 | history |
| xpcom/tests/regorder/extension/extComponentDeferred.js | blob1 | blob2 | history |
| xpcom/tests/services/Makefile.in | blob1 | blob2 | history |
| xpcom/tests/services/MyService.cpp | blob1 | blob2 | history |
| xpcom/tests/services/MyService.h | blob1 | blob2 | history |
| xpfe/appshell/src/nsXULWindow.cpp | diff1 | diff2 | blobhistory |
