wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge mozilla-central to mozilla-inbound

Browse Source
This commit is contained in:
Ed Morley 2012-08-16 16:16:10 +01:00
commit d8f8eb0094
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/removed-files.in
View File

@ -120,6 +120,7 @@ extensions/talkback@mozilla.org/components/qfaservices.xpt
extensions/talkback@mozilla.org/install.rdf
extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/
extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf
extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
extensions/testpilot@labs.mozilla.com/chrome.manifest
extensions/testpilot@labs.mozilla.com/components/TestPilot.js
extensions/testpilot@labs.mozilla.com/content/all-studies-window.js

2
image/test/reftest/gif/reftest.list
View File

@ -17,7 +17,7 @@ random-if(bug685516) == small-background-size-2.gif small-background-size-2-ref.
random == delaytest.html?transparent-animation.gif transparent-animation-finalframe.gif # incorrect timing dependence (bug 558678)
# test for bug 641198
random-if(bug685516) == test_bug641198.html animation2a-finalframe.gif
random-if(Android) == test_bug641198.html animation2a-finalframe.gif
# webcam-simulacrum.mgif is a hand-edited file containing red.gif and blue.gif,
# concatenated together with the relevant headers for

2
xpcom/base/nsError.h
View File

@ -82,7 +82,7 @@
* @return 0 or 1
*/
#if defined(NS_STATIC_CHECKING) && defined(__cplusplus)
#ifdef __cplusplus
inline int NS_FAILED(nsresult _nsresult) {
return _nsresult & 0x80000000;
}