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 m-c to m-i

Browse Source
This commit is contained in:
Phil Ringnalda 2013-06-24 16:51:59 -07:00
commit bd2fa2877b
12 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -93,3 +93,4 @@ cf8750abee06cde395c659f8ecd8ae019d7512e3 FIREFOX_AURORA_19_BASE
cc37417e2c284aed960f98ffa479de4ccdd5c7c3 FIREFOX_AURORA_21_BASE
1c070ab0f9db59f13423b9c1db60419f7a9098f9 FIREFOX_AURORA_22_BASE
d7ce9089999719d5186595d160f25123a4e63e39 FIREFOX_AURORA_23_BASE
8d3810543edccf4fbe458178b88dd4a6e420b010 FIREFOX_AURORA_24_BASE

2
b2g/confvars.sh
View File

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=B2G
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=24.0a1
MOZ_APP_VERSION=25.0a1
MOZ_APP_UA_NAME=Firefox
MOZ_UA_OS_AGNOSTIC=1

2
browser/config/version.txt
View File

@ -1 +1 @@
24.0a1
25.0a1

2
browser/modules/BrowserNewTabPreloader.jsm
View File

@ -22,7 +22,7 @@ const PREF_BRANCH = "browser.newtab.";
// The interval between swapping in a preload docShell and kicking off the
// next preload in the background.
const PRELOADER_INTERVAL_MS = 3000;
const PRELOADER_INTERVAL_MS = 600;
// The initial delay before we start preloading our first new tab page. The
// timer is started after the first 'browser-delayed-startup' has been sent.
const PRELOADER_INIT_DELAY_MS = 5000;

2
config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
24.0a1
25.0a1

2
dom/network/interfaces/nsIDOMTCPSocket.idl
View File

@ -25,7 +25,7 @@
// be possible to do (similarly to the WebSocket API):
// var s = new MozTCPSocket(host, port);
[scriptable, uuid(b82e17da-6476-11e1-8813-57a2ffe9e42c)]
[scriptable, uuid(1f99bc6f-73d3-44db-9dbf-5fc441704a7c)]
interface nsIDOMTCPSocket : nsISupports
{
/**

2
dom/network/interfaces/nsITCPSocketChild.idl
View File

@ -8,7 +8,7 @@ interface nsITCPSocketInternal;
interface nsIDOMWindow;
// Interface to allow the content process socket to reach the IPC bridge.
[scriptable, uuid(a589d96f-7e09-4edf-a01a-eb4951f42f37)]
[scriptable, uuid(bdc91763-e9a1-4122-9c2f-8f17505c8c7a)]
interface nsITCPSocketChild : nsISupports
{
// Tell the chrome process to open a corresponding connection with the given parameters

2
js/src/config/milestone.txt
View File

@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
24.0a1
25.0a1

2
mobile/android/confvars.sh
View File

@ -5,7 +5,7 @@
MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=24.0a1
MOZ_APP_VERSION=25.0a1
MOZ_APP_UA_NAME=Firefox
MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial

2
services/sync/Makefile.in
View File

@ -10,7 +10,7 @@ VPATH := @srcdir@
include $(DEPTH)/config/autoconf.mk
# Definitions used by constants.js.
weave_version := 1.26.0
weave_version := 1.27.0
weave_id := {340c2bbc-ce74-4362-90b5-7c26312808ef}
# Preprocess files.

2
xpcom/components/Module.h
View File

@ -21,7 +21,7 @@ namespace mozilla {
*/
struct Module
{
static const unsigned int kVersion = 24;
static const unsigned int kVersion = 25;
struct CIDEntry;

2
xpcom/io/nsIBinaryInputStream.idl
View File

@ -17,7 +17,7 @@
* @See nsIBinaryOutputStream
*/
[scriptable, uuid(7b456cb0-8772-11d3-90cf-0040056a906e)]
[scriptable, uuid(42084755-fedc-4310-831c-4f43e7b42e20)]
interface nsIBinaryInputStream : nsIInputStream {
void setInputStream(in nsIInputStream aInputStream);