Gregory Szorc 94e8454958 Merge mozilla-central into build-system ... dom/interfaces/svg/Makefile.in and dom/media/Makefile.in had merge conflicts. They were resolved by hand. The former needed 2 IDLs removed. The latter had a context conflict for EXPORTS_NAMESPACES.		2013-03-12 13:04:55 -07:00
..
android
AndroidBridge.cpp	Bug 846774 - Replace the sync event with an ack flag on events. r=cpeterson	2013-03-10 22:43:30 +00:00
AndroidBridge.h	Bug 846774 - Replace the sync event with an ack flag on events. r=cpeterson	2013-03-10 22:43:30 +00:00
AndroidDirectTexture.cpp
AndroidDirectTexture.h
AndroidGraphicBuffer.cpp
AndroidGraphicBuffer.h
AndroidJavaWrappers.cpp	Bug 846774 - Replace the sync event with an ack flag on events. r=cpeterson	2013-03-10 22:43:30 +00:00
AndroidJavaWrappers.h	Bug 846774 - Replace the sync event with an ack flag on events. r=cpeterson	2013-03-10 22:43:30 +00:00
AndroidJNI.cpp	Bug 844429 - B2G SMS & MMS: move SMS codes into dom/mobilemessage to make it generic for MMS. r=vicamo	2013-03-01 16:38:47 +08:00
GfxInfo.cpp	Bug 845639 - Remove stagefright blocklisting for Sony Xperia Ion - r=bjacob	2013-03-05 14:42:22 +13:00
GfxInfo.h	Bug 802827 - Android blacklisting: Use the Android version RELEASE string, instead of the SDK_INT number - r=joedrew	2012-12-21 17:32:14 -05:00
Makefile.in	Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium	2013-03-12 10:17:46 -07:00
moz.build	Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium	2013-03-12 10:17:46 -07:00
nsAppShell.cpp	Bug 846774 - Replace the sync event with an ack flag on events. r=cpeterson	2013-03-10 22:43:30 +00:00
nsAppShell.h
nsClipboard.cpp
nsClipboard.h
nsDeviceContextAndroid.cpp
nsDeviceContextAndroid.h
nsFilePicker.cpp
nsFilePicker.h
nsIAndroidBridge.idl
nsIdleServiceAndroid.cpp
nsIdleServiceAndroid.h
nsIMEPicker.cpp
nsIMEPicker.h
nsLookAndFeel.cpp	Backed out changeset 5af4c6bd5104 (bug 827075) because it is no longer necessary	2013-01-14 16:21:54 -05:00
nsLookAndFeel.h
nsPrintOptionsAndroid.cpp
nsPrintOptionsAndroid.h
nsScreenManagerAndroid.cpp
nsScreenManagerAndroid.h
nsWidgetFactory.cpp
nsWindow.cpp	Bug 849961 - Make nsWindow::DispatchMultitouchEvent honor event.mFlags.mMultipleActionsPrevented. r=smaug, r=wesj.	2013-03-12 11:29:53 +00:00
nsWindow.h	Bug 558976 part.6 Rename nsIWidget::OnIMETextChange() to nsIWidget::NotifyIMEOfTextChange() r=roc, sr=roc	2013-03-06 15:14:34 +09:00