Gregory Szorc f0b7e3972c Merge mozilla-central into build-system ... There were merges in configure.in and some Makefile.in. None had any conflicts. I spot verified the Makefile.in changes and confirmed that the changes did not touch any DIRS* variables.		2013-02-27 10:03:52 -08:00
..
android
AndroidBridge.cpp	Bug 844289 - Guard against missing Surface.mNativeSurface on Android r=kats	2013-02-26 09:28:57 -05:00
AndroidBridge.h	Bug 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05:00
AndroidDirectTexture.cpp
AndroidDirectTexture.h
AndroidGraphicBuffer.cpp
AndroidGraphicBuffer.h
AndroidJavaWrappers.cpp	Bug 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05:00
AndroidJavaWrappers.h	Bug 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05:00
AndroidJNI.cpp	Bug 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05:00
AndroidLayerViewWrapper.cpp	Bug 844289 - Guard against missing Surface.mNativeSurface on Android r=kats	2013-02-26 09:28:57 -05:00
AndroidLayerViewWrapper.h	Bug 785597 - Get rid of unused mGLVersion field. r=snorp	2012-12-21 11:33:09 -05:00
GfxInfo.cpp	Bug 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05: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 839622 - Move websms backend JNI bindings so that they are not built if websms is not enabled. r=blassey	2013-02-08 16:42:14 -05:00
moz.build	Bug 784841 - Part 18μ: Convert /widget; f=Ms2ger rs=ted	2013-02-25 13:20:02 -08:00
nsAppShell.cpp	Bug 834611 - Part 1: Fix Android widget warnings. r=kats	2013-01-25 11:33:40 -08:00
nsAppShell.h
nsClipboard.cpp
nsClipboard.h
nsDeviceContextAndroid.cpp
nsDeviceContextAndroid.h
nsFilePicker.cpp	Bug 795013 - Fix check for filter masks in Android file picker. r=blassey	2012-10-02 11:00:17 -07:00
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 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05:00
nsWindow.h	Bug 841503 - Delete a bunch of non-OMTC android codepaths. r=BenWa,snorp	2013-02-19 12:35:38 -05:00