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
107,884 Commits 1 Branch 166 Tags 1.2 GiB
68f1a7379e
Commit Graph

9096 Commits

Author SHA1 Message Date
Gene Lian
732b144fc3 Bug 790823 - Fix test failure: Unexpected interface name in global scope: MozTimeManager. r=jlebar 2012-09-13 12:39:57 +08:00
Hsin-Yi Tsai
94eea10264 Bug 788433 - B2G RIL: DOM request didn't return anything when 'onsuccess'. r=philikon 2012-09-10 11:54:49 +08:00
Gregor Wanger
0838ea13bb Bug 788440 : B2G Contact: Permission denied to access property 'id'. r=bholley 2012-09-13 12:02:30 +08:00
Chris Jones
311c0b45b5 Bug 790764: Make <html:iframe mozbrowser remote> behave like <xul:browser remote>. r=roc 2012-09-12 20:50:40 -07:00
Doug Turner
7ea3feba6f Bug 787299 - Device Storage - Filter out mimetypes during calculation of disk usages. r=bent 2012-09-05 14:30:36 -07:00
Doug Turner
78124a5616 Bug 788122 - Device storage. Add an 'apps' storage type. r=sicking 2012-09-14 09:14:58 -07:00
Ed Morley
10a0b4ea04 Backout e5af3d785252 (bug 791084), 7ad6e513e114, b040fefd038e (bug 788612), 6996c091767d (bug 787299) for introducing new orange 2012-09-14 12:41:29 +01:00
Doug Turner
8c8fed83c5 Bug 791084 - Device storage - Seperate permissions based on storage type. r=bent 2012-09-13 22:37:00 -07:00
Doug Turner
56201d5cea No Bug. Whitespace cleanup. r=me 2012-09-13 22:37:00 -07:00
Doug Turner
b2a0e3d9a4 Bug 788612 - Move bundle handing into nsDOMDeviceStorage to avoid calls to the nsIStringBundleService. r=bent 2012-09-13 22:37:00 -07:00
Doug Turner
bcdf40188d Bug 787299 - Device Storage - Filter out mimetypes during calculation of disk usages. r=bent 2012-09-05 14:30:36 -07:00
Ben Turner
6d05ed9319 Bug 791162 - 'Fix off-main-thread access of BluetoothService::Get'. r=qDot. 2012-09-13 21:27:45 -07:00
Peter Van der Beken
71b55b1f68 Fix for bug 788532 (Add the new DOM bindings API to DOM lists). r=bz. 
--HG--
extra : rebase_source : 18e21a786b6a9cc2aeada52ba5ca3a2614cb596b
 2012-09-05 22:49:53 +02:00
Peter Van der Beken
bc837e12ce Fix for bug 788532 (Add the new DOM bindings API to DOM lists) - Rename nsIDOMHTMLCollection::GetNodeAt to GetElementAt. r=bz. 
--HG--
extra : rebase_source : 9bd26842a548580b7ea90a29d2fdba8629a70ef7
 2012-09-05 17:42:58 +02:00
Yoshi Huang
f74adb22e1 Bug 788377 - Part 3: Get SIM Contacts. r=philikon 2012-09-05 17:16:32 +08:00
Yoshi Huang
23a39c30a4 Bug 788377 - Part 2: Rename type to contactType in Contact. r=gwagner 2012-09-07 15:57:22 +08:00
Yoshi Huang
17a57d42b8 Bug 788377 - Part 1: Rename type to contactType in getICCContacts. r=philikon 2012-09-06 11:36:12 +08:00
Vincent Chang
443bde7b49 Bug 788081 - B2G tethering: correctly handle 1xx responses from netd. r=philikon 2012-09-05 17:30:48 +08:00
Mike Habicher
00a718898e Bug 790746 2012-09-12 22:24:00 -04:00
David Chan
75a2500868 Bug 790815 - appStatus is not properly set for packaged apps [r=fabrice] 2012-09-12 17:52:03 -07:00
Fabrice Desré
d0e21218f9 Backed out changeset f5a65da34f1d 2012-09-12 17:49:30 -07:00
David Chan
9a39eef032 date: Wed Sep 12 17:26:44 2012 -0700 
Bug 790815 - Fix appStatus assignment for packaged apps [r=fabrice]
 2012-09-12 17:47:10 -07:00
David Chan
d7680c1cc5 Bug 790795 - mozApps.installPackage doesn't call onsuccess/onerror handlers [r=fabrice] 2012-09-12 16:12:59 -07:00
Mark Goodwin
7ebcef3a30 Bug 770176 - fix one-char typo in CSP error string. (r=l10n) 
--HG--
extra : rebase_source : f804a0e80252624ffca3988e56f5c0d7bd96ba7b
 2012-09-12 13:30:25 -07:00
Boris Zbarsky
c0a96f3008 Bug 790273. Add support for [LenientThis] in WebIDL. r=peterv 2012-09-12 17:24:58 +01:00
James Willcox
a06590001d Bug 786248 - Followup to add a small comment 2012-09-12 10:20:27 -04:00
James Willcox
e78b363462 Bug 786248 - Always invert Flash video on Honeycomb r=blassey 2012-09-12 10:17:22 -04:00
Gina Yeh
1cca3ee12d Bug 789014 - Final version: Broadcast bonding-related events via system message, r=qdot, r=mrbkap 2012-09-12 22:03:42 +08:00
Patrick Wang
7a1bf993f1 Bug 787517: Test case for reproducing bug r=jlebar 2012-09-12 14:12:09 +08:00
Patrick Wang
9cb2eeac19 Bug 787517: Prevent failure in BrowserElementParent when MessageManager is not available for sending message r=jlebar 2012-09-12 14:12:12 +08:00
Eric Chou
821f8c464f Bug 790136 - Registered/Unregistered HFP_AG & HSP_AG services, r=qdot 2012-09-12 15:44:05 +08:00
Eric Chou
c0aa3a48af Bug 790136 - do cleanups before shutdown, r=qdot 2012-09-12 15:44:05 +08:00
Eric Chou
61ba2320b4 Bug 790136 - Added missing service uuids, r=qdot 2012-09-12 15:44:05 +08:00
Fabrice Desré
cdd45aeb2c Bug 786361 - Prevent a startup race waiting for the DOM application registry to load [r=marshall] 2012-09-11 18:17:01 -07:00
Donovan Preston
75e059b4c7 Bug 788960 - Intermittent test_tcpsocket.js | command timed out: 1200 seconds without output, attempting to kill. timeout code to show error to help debugging. r=fabrice 2012-09-11 15:06:08 -07:00
Myk Melez
0626a2e761 bug 777400 - disable mozApps.installPackage API in Firefox for Desktop and Android; r=fabrice, sr=sicking 2012-09-11 13:53:42 -07:00
Ehsan Akhgari
bf95568d0e Merge IonMonkey into mozilla-inbound 2012-09-11 16:38:44 -04:00
David Anderson
7b438ddde2 Merge IonMonkey to mozilla-central. a=arewefastyet 
--HG--
rename : content/base/src/nsWebSocket.cpp => content/base/src/WebSocket.cpp
rename : content/base/src/nsWebSocket.h => content/base/src/WebSocket.h
 2012-09-11 10:25:14 -07:00
Bobby Holley
4473d2369c Bug 788914 - Kill the XOW flag. r=mrbkap 
There are really two questions to be asked: is the caller chrome, and does the
caller subsume the callee. We have other, more precise ways of asking both of
these questions.
 2012-09-11 01:05:10 -07:00
Bobby Holley
9d14b3e60e Bug 788914 - Kill partially transparent wrappers. r=mrbkap 2012-09-11 01:05:10 -07:00
Bobby Holley
00bcee83e8 Bug 789494 - Rip enablePrivilege out of misbehaving mochitests. r=mccr8 2012-09-11 01:05:10 -07:00
SADINENI RAVI CHANDRA
8c1e9ff557 Bug 654618: Fix signed/unsigned comparison warnings in nptest.cpp. r=bsmedberg 2012-09-10 23:53:04 -07:00
Daniel Holbert
7554b18747 Bug 790043: Make nsDeviceStorage consistent on using PRTime for all of its "aSince" / "mSince" vars. r=dougt 2012-09-10 23:52:47 -07:00
Chris Jones
e01d45f3fa Bug 788943: Allow TabParents to capture event series for faster dispatch to subprocesses. Implements capturing of touch-event series. r=smaug sr=roc 2012-09-11 13:05:52 -07:00
Boris Zbarsky
b8ae854244 Bug 787543. Put all the typedeffy bits back in WebGLRenderingContext now that we can. r=peterv 2012-09-11 20:08:30 +01:00
Boris Zbarsky
df94b5400b Bug 787554. Don't prefix WebIDL getters names with a Get if they look like simple member access on the C++ side. r=peterv 2012-09-11 20:08:24 +01:00
Boris Zbarsky
6a4003fd4a Bug 789636. Make getInterface on XHR and QueryInterface on all WebIDL objects be [ChromeOnly]. r=peterv 2012-09-11 20:08:24 +01:00
Boris Zbarsky
48ddcad8e3 Bug 790123. Make sure to not lose a single trailing newline in stripTrailingWhitespace. r=mats 2012-09-11 18:37:22 +01:00
Bobby Holley
2d6b93cf59 Bug 784792 - Remove IsClosedOrClosing() assertion. r=bz 2012-09-11 10:23:31 -07:00
Steven Lee
18e48d0ffd Bug 714358 System time change implementation, r=mounir 2012-09-11 02:40:00 -04:00
Steven Lee
1a3d6cea38 Bug 714358: Time manager implementation. r=jlebar 2012-09-11 02:05:00 -04:00
Dave Hylands
bf39dd4c55 Bug 784805 - Set the process name (comm) to the app name. r=cjones 2012-09-10 21:30:33 -07:00
Dave Hylands
7d713cabde Bug 784805 - Add a name field to mozIApplication and set it from the manifest r=fabrice 2012-09-10 21:30:10 -07:00
Vicamo Yang
0c56f5bc04 Bug 785988 - Part 2: test scripts, r=marshall_law 2012-09-11 12:23:12 +08:00
Vicamo Yang
c304e770f7 Bug 785988 - Part 1: allow empty longName/shortName for carrier info, r=marshall_law 2012-09-11 12:23:08 +08:00
Phil Ringnalda
e91fd8ea3f Backout 38052fd23aec, 910406b62ebc, 7b15c079564c, d7c1d26f8bc9 (bug 716575) for probable reftest and certain talos bustage on Android 2012-09-10 20:57:31 -07:00
David Anderson
24145fc9a1 Merge from mozilla-central. 2012-09-10 12:16:38 -07:00
Steven Lee
36c90deabb Bug 714358: Time manager interface. f=mounir, sr=mounir 2012-09-10 07:14:00 -04:00
James Willcox
40f4ac5682 Bug 750217 - Don't schedule plugin timers if the plugin isn't running r=josh 
--HG--
extra : rebase_source : 9eb8316c48705b01c72b46dab993439f37a5607b
 2012-09-11 10:24:25 -04:00
James Willcox
e4374bc2d0 Bug 778442 - Add some null guards in nsPluginInstanceOwner::GetVisibleRect r=blassey 
--HG--
extra : rebase_source : 314d6defe42a0908f071eb7ca78393470b854f05
 2012-09-11 10:20:44 -04:00
Vicamo Yang
93b85de558 Bug 787370 - Part 3/3: test script, r=marshall_law 2012-09-10 13:56:08 +08:00
Vicamo Yang
36c56242e4 Bug 787370 - Part 2/3: add debug messages for SMS-STATUS-REPORT, r=marshall_law 2012-09-10 13:56:04 +08:00
Vicamo Yang
a12d3b1a33 Bug 787370 - Part 1/3: notify missed SmsManager.onsent event, r=marshall_law 2012-09-10 13:55:59 +08:00
Daniel Holbert
f32f6b5f8b Bug 789382: Change nsIScriptError methods init() and initWithWindowID() to take nsAString, rather than wchar / PRUnichar*. r=bz sr=bsmedberg 2012-09-09 16:29:12 -07:00
Mounir Lamouri
44c8365508 Bug 787538 - Make sure the event listener is disconnected if the screen lock is rejected by the backend. r=jlebar 2012-09-11 14:15:43 +01:00
Mounir Lamouri
3c6db2c950 Bug 784549 - lockOrientation() should accept an Array of DOMString's in addition of a DOMString. r=jlebar,khuey 2012-09-11 11:55:08 +01:00
Nathan Froyd
9a8267f275 Bug 786703 - fix dom/ build failures from introducing PARALLEL_DIRS; r=glandium 2012-09-11 07:47:42 -04:00
Gabor Krizsanits
5b5c7e6eab Bug 737003 - Offer a way to apply user agent stylesheet on a given document; r=bz 2012-09-11 13:51:10 +02:00
David Anderson
b0a287cfcc Merge from mozilla-central. 2012-09-07 15:17:11 -07:00
Ed Morley
46b3150fec Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-09-07 15:27:15 +01:00
Ed Morley
38c6f2fdd8 Backout 5853df66d488, e8fadd906232, d787279d282c, 8c1ed6327355, 94cfcf5da7c8, 87aa103d7e87 (bug 585922) for failures in test_bug411236.html 2012-09-07 09:15:34 +01:00
Eric Chou
b6c0097ba3 Bug 788254 - [b2g-bluetooth] nsTArray should not be passed back as return value, r=qdot 2012-09-07 15:56:12 +08:00
Bobby Holley
27358249f4 Bug 788914 - Kill the XOW flag. r=mrbkap 
There are really two questions to be asked: is the caller chrome, and does the
caller subsume the callee. We have other, more precise ways of asking both of
these questions.
 2012-09-06 22:55:18 -07:00
Bobby Holley
3b8d75b1cc Bug 788914 - Kill partially transparent wrappers. r=mrbkap 2012-09-06 22:55:18 -07:00
Boris Zbarsky
06092f65fb Bug 767931. Make drawWindow and asyncDrawXULElement ChromeOnly. r=roc 2012-09-07 01:29:47 -04:00
Kan-Ru Chen (陳侃如)
61237219e9 Bug 789385 - Use AGPS_TYPE_SUPL instead of AGPS_TYPE_ANY. r=dougt 2012-09-07 13:04:05 +08:00
L. David Baron
ff3df34b87 Rename nsIPresShell::InitialReflow to Initialize since it doesn't actually perform reflow. (Bug 788956) r=roc 2012-09-06 21:16:09 -07:00
John Schoenick
7d6435590f Backout 827807082790 (bug 786650) for causing bug 789033 2012-09-06 19:03:22 -07:00
David Anderson
6c5722e35b Merge from mozilla-central. 2012-09-06 18:28:59 -07:00
Ryan VanderMeulen
0bf9ce3a48 Merge the last PGO-green inbound changeset to m-c. 2012-09-06 20:37:59 -04:00
Ed Morley
b96b62f2dd Backout ea472ffba523 & ae4a4bfde41e (bug 786922) for causing bug 789008 2012-09-06 11:58:20 +01:00
Ed Morley
c6d2c20860 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-09-06 10:19:16 +01:00
Ms2ger
6b6c1230f5 Bug 763367 - Add support for [EnforceRange] and [Clamp]; r=bz 2012-09-06 09:25:03 +02:00
Ms2ger
aefd975ea8 No bug - Move the bool specialization of PrimitiveConversionTraits from between the integer ones. 2012-09-06 09:20:29 +02:00
Ms2ger
da816a754b Bug 785067 - Outparamdel nsGlobalWindow::SaveWindowState; r=mrbkap 2012-09-06 09:20:26 +02:00
Ms2ger
921135d916 Bug 768793 - Remove DOMJSClass::mGetWrapperCacheVTableOffset; r=khuey 2012-09-06 09:14:49 +02:00
Ms2ger
358f7a91f3 Bug 782040 - Move ProgressEvent to event impl codegen; r=smaug 2012-09-06 09:14:49 +02:00
Ms2ger
4332194051 Bug 780161 - Part a: Deduplicate code in nsDOMWindowList; r=peterv 2012-09-06 09:14:49 +02:00
Ms2ger
454aa09861 Bug 788211 - Fix a few bugs in CGDOMJSProxyHandler_defineProperty; r=bz 2012-09-06 09:14:48 +02:00
Ms2ger
d3015b7146 Bug 782651 - Get importTestsuite.py working again; r=jhammel 
--HG--
rename : dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode.html => dom/imptests/webapps/DOMCore/tests/submissions/Ms2ger/test_Range-intersectsNode-binding.html
 2012-09-06 09:14:48 +02:00
Fabrice Desré
8c06bd7bb0 Bug 777208 - ActivitiesService should not broadcast information to all content processes [r=gwagner] 2012-09-05 20:47:47 -07:00
Makoto Kato
c28c020a8f Bug 784912 - nsIStreamListener.onDataAvailable should handle 64-bit offset. r=honza 2012-09-06 11:41:02 +09:00
Kyle Machulis
cc79f8ed20 Bug 756299: Patch 2 - IPC Socket Creation Functions and Type Additions; r=mrbkap 2012-09-05 20:06:20 -07:00
Ryan VanderMeulen
564bdb74b5 Merge m-c to inbound. 2012-09-05 23:03:09 -04:00
David Anderson
043ddae94a Merge from mozilla-central. 
--HG--
rename : js/jsd/jsd_scpt.c => js/jsd/jsd_scpt.cpp
rename : js/jsd/jsd_stak.c => js/jsd/jsd_stak.cpp
rename : js/jsd/jsd_val.c => js/jsd/jsd_val.cpp
 2012-09-05 16:18:11 -07:00
Doug Turner
2a340fad67 Bug 788588 - Device storage on Windows should use NS_WIN_PERSONAL_DIR. r=blassey 2012-09-05 14:30:36 -07:00
Doug Turner
0c64eca32d Bug 787299 - Device Storage - Filter out mimetypes during calculation of disk usages. r=bent 2012-09-05 14:30:36 -07:00
Doug Turner
f6796f9d1f Bug 786922 - Device Storage - use a properties file instead of the mime service. r=bent 2012-09-05 14:30:36 -07:00
Doug Turner
1f6210bad2 Bug 788268 - Device Storage - Convert tests to use public types. r=bent 2012-09-05 14:30:36 -07:00
Ryan VanderMeulen
441b85ff28 Merge m-c to inbound. r=backedoutbykylehuey.com 2012-09-05 19:10:11 -04:00
Kyle Huey
e85d6a59f5 Back out dougt (bug 788588 et al.) for burning the tree (and some nostalgia). 2012-09-05 15:59:49 -07:00
Ehsan Akhgari
bbf6c4acc9 Bug 787574 - Add a script for creating stub implementations of Web IDL interfaces; r=bzbarsky 
DONTBUILD since this is just a script, and NPOTB.
 2012-09-06 13:53:43 -04:00
Doug Turner
19352cb5c9 Bug 786922 - Device Storage - use a properties file instead of the mime service. r=bent 2012-09-05 14:30:36 -07:00
andrew.quartey@gmail.com
67585c898f Bug 701299 - crash nsGlobalWindow::LeaveModalState, r=smaug,khuey 2012-09-05 21:25:53 +03:00
Olli Pettay
ab1e1ec8fe Bug 787961 - Remove mDocument from WorkerPrivate, r=bent 
--HG--
extra : rebase_source : 6f2560f658e365b89bb602d498b082cf84bdaef9
 2012-09-05 20:47:57 +03:00
Matt Brubeck
8f85d6a619 Back out ae2e45d25a1a, 4f144a06d0cc, 2e80be1d7d18 (bug 716575) for Android Talos red 2012-09-17 11:11:30 -07:00
Rob Wood
e16a1b30e4 Bug 790988 - Develop WebTelephony test to verify incoming call while have another call held, update manifest; r=jgriffin, DONTBUILD because NPOTB 2012-09-14 15:55:40 -04:00
Steven Lee
5ac92804ab Bug 791652: Navigator::GetMozTime doesn't always set its outparam when returning success, r=jlebar 2012-09-17 08:59:00 -04:00
David Anderson
25c3dd55c0 Merge from mozilla-central. 
--HG--
rename : js/src/sharkctl.cpp => js/src/devtools/sharkctl.cpp
rename : js/src/sharkctl.h => js/src/devtools/sharkctl.h
rename : js/src/MemoryMetrics.cpp => js/src/jsmemorymetrics.cpp
 2012-08-29 17:57:37 -07:00
David Anderson
6b403f94c2 Merge from mozilla-central. 
--HG--
rename : content/base/public/nsIFrameMessageManager.idl => content/base/public/nsIMessageManager.idl
 2012-08-29 17:51:24 -07:00
Chris Jones
3b5226ebd3 Bug 776850: Kill subprocesses that fail backstop permission checks. r=jlebar 2012-09-05 15:18:48 -07:00
John Schoenick
6c657c7493 Backout a6f040934c99 (Bug 548133) for reftest orange 2012-09-05 14:58:17 -07:00
Nathan Froyd
c00a7f490e Bug 774757 - don't generate static initializers with new bindings; r=bz 2012-08-29 17:16:23 -04:00
Fabrice Desré
f076c96d44 Bug 775327 - App ID generation and storage is unsafe [r=sicking] 2012-09-05 18:07:21 -07:00
Fabrice Desré
557d38dbbf Bug 788872 - Cannot run packaged apps after install without restarting gecko [r=gwagner] 2012-09-05 17:37:41 -07:00
Gregor Wagner
3b332a6a7f Bug 788561 - SettingsAPI: Use createLock instead of getLock. r=bent 2012-09-05 17:33:03 -07:00
Doug Turner
bcd286b290 Bug 788588 - Device storage on Windows should use NS_WIN_PERSONAL_DIR. r=blassey 
--HG--
extra : rebase_source : 2336d1171ffa9ab177ce35b32836296b1251fea9
 2012-09-05 14:30:36 -07:00
Doug Turner
94b0436da7 Bug 786922 - Device Storage - use a properties file instead of the mime service. r=bent 
--HG--
extra : rebase_source : 17cd95eadccd4155dd00620586a1d655892f59f9
 2012-09-05 14:30:36 -07:00
Doug Turner
139ac99074 Bug 788268 - Device Storage - Convert tests to use public types. r=bent 
--HG--
extra : rebase_source : 208751cfe7b68e67d65686d6606766dd5caebf59
 2012-09-05 14:30:36 -07:00
Gregor Wagner
8d933df91d Bug 785233 - Don't overwrite indexeddb property. r=mrbkap 2012-08-29 15:52:48 -03:00
Michael Wu
88b799b19a Bug 785554 - Remove unnecessary touches in events sent to content process, r=cjones 2012-08-29 13:06:11 -03:00
Andrew Sutherland
36a4755800 Bug 786666 - workaround __exposedProps__ typed array issue in mozTCPSocket. r=fabrice 2012-08-29 12:47:24 -03:00
Chris Jones
d31b38514b Bug 781725: Refactor TabChild to allow pre-created instances, and then use a pre-created instance to pre-load and compile BrowserElementChild.js. r=smaug 
--HG--
extra : rebase_source : f063c672d55da46541fdd1b6f6ff0cf510a6853f
 2012-08-29 12:26:18 -03:00
Ehsan Akhgari
531525812e Bug 579517 follow-up: Remove NSPR types that crept in 
--HG--
extra : rebase_source : adad9af01d9168a14d87c201c1bd51a3a7a768f5
 2012-08-29 10:56:51 -04:00
Fabrice Desré
ddc1158fbe Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 4 : leak fix [r=jlebar] 2012-08-29 07:31:10 -07:00
Vincent Chang
21d8b6246a Bug 736089 - Handle broken wifi configurations more gracefully, r=mrbkap DONTBUILD 2012-08-28 16:14:26 -03:00
Blake Kaplan
20ce728744 Bug 786283 - Report to the caller when a scan request fails. r=vchang 2012-08-28 12:55:41 -03:00
Fabrice Desré
55e3fe03b2 Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 2 : refactoring AppsService to cache webapps data in the content process [r=mounir, vingtetun] 2012-08-27 19:43:57 -07:00
Fabrice Desré
e973026a8b Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 1 : nsPrincipal changes [r=mounir] 2012-08-27 19:43:57 -07:00
Blake Kaplan
ecd7387454 Bug 785975 - Reconnect to the network after DHCP fails. r=vchang 2012-08-27 17:48:25 -03:00
Olli Pettay
ec8a1d0493 Bug 784259 - nsDOMMutationObserver should inherit nsWrapperCache, r=peterv 2012-08-28 18:25:19 +03:00
Phil Ringnalda
5423f5636c Back out a08d28e8a86b (bug 768868), 9b96029a9cf0 and 010b5cb3576d (bug 781620) for test failures and leaks 2012-08-27 21:34:53 -07:00
Fabrice Desré
f24d334b22 Bug 768868 - App manifest should support application type [r=vingtetun] 2012-08-27 19:43:57 -07:00
Fabrice Desré
a8c212eb9e Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 2 : refactoring AppsService to cache webapps data in the content process [r=mounir, vingtetun] 2012-08-27 19:43:57 -07:00
Fabrice Desré
b2b008100b Bug 781620 - Bridge the DOM webapps registry with nsIPrincipal::GetStatus() - Part 1 : nsPrincipal changes [r=mounir] 2012-08-27 19:43:57 -07:00
Matt Brubeck
71245eab94 Back out changeset 5ff334b7781d (bug 786003) because of test failures on Windows on a CLOSED TREE 2012-08-27 16:28:51 -07:00
Ed Morley
1525bc6440 Backout 3182f9d08c2d (bug 347307), 2a30593cca79 (bug 507578), b87b27f5a417 (bug 769764) for m-oth permaorange in browser_463205.js 2012-09-13 22:42:29 +01:00
Ehsan Akhgari
d22825dcf7 Remove an unneeded header from nsDOMStorage.cpp, no bug, r=me 2012-09-13 17:20:03 -04:00
Patrick McManus
22205a5249 bug 769764 move proxy resolution to separate thread and remove sync api r=biesi sr=josh 2012-09-13 15:22:56 -04:00
Fabrice Desré
d73e81f572 merge 2012-09-13 11:48:20 -07:00
Fabrice Desré
36bb58bca1 Bug 788125 - System messages don't work with different entry points if the app is not already open [r=vingtetun] 2012-09-13 11:47:34 -07:00
Jonas Sicking
0ceee1763a Bug 781866 - Clear up and simplify some names in localStorage code. r=honzab 2012-09-13 20:47:14 +02:00
Jan Varga
90d87d4158 Bug 776416 - Fix remaining tests. r=sicking 2012-09-13 20:47:04 +02:00
Jonas Sicking
088d6f8f6f Bug 776416 - Remove exceptions to 5MB quota rule in localStorage. r=honzab 2012-09-13 20:46:50 +02:00
Phil Ames
cd2459e50f Bug 690168. Implement the 'Allow-From' directive for X-Frame-Options. r=bzbarsky 2012-08-27 15:46:24 -04:00
Ben Turner
36712eead9 Bug 786003 - 'Add a few extra tests for blobs in IndexedDB'. r=jst. 2012-08-27 12:40:06 -07:00
Doug Turner
cf0d2ce52c Bug 774368 - Calling removeMessageListener after test completes. r=smaug 2012-09-06 08:53:25 -07:00
Dave Hylands
da07f452d4 Bug 782289 - Bah - Added in the second part of the patch. r=philikon 2012-09-06 13:51:15 -07:00
Dave Hylands
50aa8610a3 Bug 782289 - Forward headphone status changed notification from gonk to chrome. r=philikon 
The wrong patch was applied previously. This changeset rolls back the previous change and
applies the correct one.
 2012-09-06 13:47:58 -07:00
David Anderson
188c88907e Merge from mozilla-central. 2012-08-22 16:09:24 -07:00
Matt Brubeck
6d927fa3a5 Bug 716575 (1/4) - Add a scriptable interface to GetViewportInfo [r=dbaron] 
--HG--
extra : rebase_source : be8a0dca63bb11418dfe9adf08c4717f8059146b
 2012-08-22 13:17:20 -07:00
Matt Brubeck
44b556a8be Bug 716575 (1/4) - Add a scriptable interface to GetViewportInfo [r=dbaron] 2012-08-22 13:17:20 -07:00
David Anderson
1ef4c57410 Merge from mozilla-central. 2012-08-21 15:59:12 -07:00
Brendan Dahl
3f688bb97f Bug 745025 - Part 1 - Adds mozPrintCallback for canvas. r=smaug 2012-08-31 10:45:45 -07:00
Kyle Machulis
93cbb2ff95 Bug 783426 - Async firing for FireSuccess/Error on DOMRequest; r=jonas r=khuey 2012-09-04 13:19:22 -07:00
Eric Faust
497dfe5e4e Bug 781387 - Codegen infallibility data for Paris bindings methods. (r=peterv) 2012-09-04 14:46:38 -04:00
Kyle Machulis
dbd693fab8 Bug 787581 - Fix nullptr access crash in BluetoothManager Destructor; r=echou 2012-09-04 10:29:06 -07:00
Benjamin Smedberg
25de92431b Bug 700583 - Null-check our way out of crashes on both mobile and desktop in pr_FindSymbolInLib caused by plugin code where the plugin fails to load correctly, r=josh 2012-08-21 14:38:51 -04:00
Eric Chou
313d204135 Bug 784255 - [b2g-bluetooth] devicefound event does not come up correctly, r=qdot 2012-08-21 14:24:05 +08:00
David Zbarsky
fbb04700b6 Bug 784004 - Don't include Layers.h everywhere Part 3 r=nical 2012-08-21 00:06:46 -04:00
Eric Chou
14bcc1f020 Bug 783932 - [b2g-bluetooth] Fix wrong textwidth(tw=) value in Mode line, r=qdot 2012-08-21 11:21:24 +08:00
Gina Yeh
b9012edcf5 Bug 783454 - v1: Create devicefound event with event generator, r=qdot 2012-08-21 10:54:28 +08:00
Kyle Machulis
c1b5777800 Bug 783431 - Fix js array initialization for bluetooth and telephony; r=mrbkap 2012-08-20 18:26:44 -07:00
Kyle Machulis
a410f6a257 Bug 784179: Wrong thread assertion in GetPairedDevicePropertiesInternal; r=gwagner 2012-08-20 18:24:48 -07:00
David Anderson
565400115a Merge from mozilla-central. 2012-08-16 14:04:20 -07:00
David Anderson
6fe112e8bf Merge from mozilla-central. 2012-08-15 14:22:26 -07:00
Paul Adenot
627efd03dc Bug 774581: Send event when starting/stopping audio or video recording; r=anant,mhabicher 2012-08-17 09:10:08 -07:00
Nick Desaulniers
30e8676a5a Bug 781379: getNotInstalled should be under mgmt and return apps from all origins; r=felipe 2012-08-20 10:19:56 -07:00
Ryan VanderMeulen
f12fa88179 Merge m-c to inbound. 2012-08-20 20:21:35 -04:00
Olli Pettay
baa2eb76c7 Bug 783856 - Autogen PopupBlockedEvent, r=jst 2012-08-20 11:26:34 -07:00
Karl Tomlinson
2a3fd384a0 b=780059 tidy up API for FindVisualAndDepth r=mattwoodrow 
--HG--
extra : rebase_source : c6022bd51aad41b7439531e7c3db1725aabda5e7
 2012-08-20 16:20:37 +12:00
Gina Yeh
392f4dff11 Bug 778640 - Final version: Firing devicedisappeared event, r=qdot, r=smaug 
---
 dom/bluetooth/BluetoothAdapter.cpp                 |   16 ++++++++++++++-
 dom/bluetooth/Makefile.in                          |    1 +
 .../nsIDOMBluetoothDeviceAddressEvent.idl          |   21 ++++++++++++++++++++
 js/xpconnect/src/event_impl_gen.conf.in            |    3 +++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl
 2012-08-20 12:23:32 +08:00
Vicamo Yang
195af0be56 Bug 782338: fix 'Emulator callback still pending when finish() called', r=philikon,marshall_law 2012-08-20 11:18:25 +08:00
Matt Woodrow
7591d1ef12 Bug 782372 - Fix clang build. r=nical 2012-08-20 14:39:10 +12:00
Nicolas Silva
047b99ba78 Bug 782372 - Splits ImageLayers.h into ImageLayers.h ImageContainer.h and ImageTypes.h, r=bgirard 2012-08-19 15:33:25 -04:00
Fabrice Desré
3cc4e0a638 Bug 783825 - Fix b2g breakage after bug 553102 - Part 1 : fix mozChromeEvent events and system message manager [r=gal] 2012-08-19 12:00:19 -07:00
Ryan VanderMeulen
25940ee99c Merge the last PGO-green inbound changeset to m-c. 2012-08-18 19:10:45 -04:00
Kyle Huey
806819677e Bug 773435: Remove some extraneous nsIImageLoadingContent includes. r=jlebar 2012-08-18 12:15:04 -07:00
Ed Morley
55d147cb39 Backout 6943b37c68cc (bug 751809) for bug 783723 2012-08-18 14:11:13 +01:00
Masatoshi Kimura
bedd012505 Bug 783532 - Remove DOMError::CreateForDOMExceptionCode. r=sicking 2012-08-18 08:25:49 -04:00
Bobby Holley
4a569927e2 Bug 553102 - Make content-> access default to deny if __exposedProps__ is not defined. r=mrbkap 2012-08-17 23:14:55 -07:00
Doug Turner
171cff0cf8 Bug 782391 - Device Storage - Watch should also go through the permission prompt. r=sicking 2012-08-17 19:43:00 -07:00
Doug Turner
225924961e Bug 782352 - Broadcast local io to onchange listeners. r=sicking 2012-08-17 19:43:00 -07:00
Doug Turner
5e4e95095d Bug 777101 - DeviceStorage - Add onchange notifications test. r=khuey 2012-08-17 19:43:00 -07:00
Andrea Marchesini
eedd4662ef Bug 781153 - ArchiveReader doesn't support zip-in-zip archives, r=jst 2012-08-17 18:04:03 -07:00
Gregor Wagner
843b886805 Bug 782472 - Contacts app doesn't work when OOP. r=fabrice 2012-08-17 16:54:22 -07:00
Justin Lebar
bc5dea3c65 Bug 776129 - Part 2: Test that when a remote <iframe mozbrowser> calls window.open, we get a remote frame, and when an in-process frame calls window.open, we get an in-process frame. r=smaug 
--HG--
extra : rebase_source : f58dbae038842c0357fa71b08a215f31ff2cc0db
 2012-08-17 17:07:54 -04:00
Justin Lebar
c9bb43d3c4 Bug 776129 - Part 1: When an <iframe mozbrowser> calls window.open, the resulting frame must be OOP iff the opener frame is OOP. r=smaug 
--HG--
extra : rebase_source : 14db2573db5e9d8ffb72798f3d856f98e49f8a83
 2012-08-17 17:07:54 -04:00
Bill McCloskey
2a27218e23 Bug 783416 - Stop saving the prototype in WindowStateHolder (r=mrbkap) 2012-08-17 10:09:01 -07:00
Bobby Holley
380cfcab47 Bug 783057 - Expose find results via XPCOM. r=gwagner 2012-08-17 09:50:19 -07:00
Bobby Holley
e737c4ba76 Bug 783173 - Fix test_ipc implementations to handle mandatory __exposedProps__. r=khuey 2012-08-17 09:21:17 -07:00
David Anderson
a31e5baded Merge from mozilla-central. 2012-08-14 12:20:09 -07:00
Ed Morley
7a68f05d39 Backout 506268f7735e & ea163112807d (bug 746142) for Android build failures 2012-08-17 12:30:02 +01:00
Kan-Ru Chen
e5d2297f13 Bug 757341 - Camera direct texturing with async video. r=cjones 2012-08-17 18:56:55 +08:00
Eric Chou
823bcc084b Bug 730992 - Patch 3: Hooking things up to BluetoothAdapter, r=qdot, sr=mrbkap 
---
 dom/bluetooth/BluetoothAdapter.cpp       |  204 +++++++++++++++++++++++++++++-
 dom/bluetooth/BluetoothAdapter.h         |    8 ++
 dom/bluetooth/nsIDOMBluetoothAdapter.idl |   16 +++-
 3 files changed, 224 insertions(+), 4 deletions(-)
 2012-08-17 18:35:59 +08:00
Eric Chou
748ecff12f Bug 730992 - Patch 2: The machinery in Bluetooth*Service, r=qdot, sr=mrbkap 
---
 dom/bluetooth/BluetoothCommon.h              |    8 +
 dom/bluetooth/BluetoothService.h             |   17 +
 dom/bluetooth/linux/BluetoothDBusService.cpp |  561 ++++++++++++++++++++++++-
 dom/bluetooth/linux/BluetoothDBusService.h   |   23 +
 4 files changed, 586 insertions(+), 23 deletions(-)
 2012-08-17 18:35:59 +08:00
Eric Chou
0d4af0983c Bug 730992 - Patch 1: The DOM boilerplate for BluetoothPairingEvent, r=qdot, sr=mrbkap 
---
 dom/base/nsDOMClassInfo.cpp                   |    9 +++
 dom/base/nsDOMClassInfoClasses.h              |    1 +
 dom/bluetooth/BluetoothPairingEvent.cpp       |   78 +++++++++++++++++++++++++
 dom/bluetooth/BluetoothPairingEvent.h         |   70 ++++++++++++++++++++++
 dom/bluetooth/Makefile.in                     |    2 +
 dom/bluetooth/nsIDOMBluetoothPairingEvent.idl |   15 +++++
 6 files changed, 175 insertions(+), 0 deletions(-)
 create mode 100644 dom/bluetooth/BluetoothPairingEvent.cpp
 create mode 100644 dom/bluetooth/BluetoothPairingEvent.h
 create mode 100644 dom/bluetooth/nsIDOMBluetoothPairingEvent.idl
 2012-08-17 18:35:59 +08:00
Zoe Bellot
ccf0a0450d Bug 746142 - Part 2 - Use inputmode attribute to vary the virtual keyboard on Android. f=mounir r=cpeterson 2012-08-17 12:02:18 +02:00
Zoe Bellot
db5a881e7f Bug 746142 - Part 1 - Add inputmode attribute to HTMLInputElement. r=mounir sr=smaug 2012-08-17 11:53:44 +02:00
David Anderson
7ef28ac5ac Merge from mozilla-central. 2012-08-13 13:40:42 -07:00
Matt Woodrow
c7f63ccf07 Bug 733323 - Remove references to plugin surfaces when the plugin is destroyed. r=roc 2012-08-13 22:11:30 +12:00
Aryeh Gregor
6a9cec29c8 Bug 626472 part 3 - Remove nsnull for good; r=ehsan 2012-08-12 13:43:47 +03:00
Shian-Yow Wu
7faef9facc Bug 767375 - B2G network manager: expose IP Information of network interfaces (implementation). r=philikon 2012-08-13 21:54:42 -04:00
Shian-Yow Wu
49a75400da Bug 767375 - B2G network manager: expose IP Information of network interfaces (IDL). r=philikon 2012-08-13 21:54:42 -04:00
Alexander Boldyrev
45a38ebb0b Bug 738866 - Implement WEBGL_depth_texture extension - r=jgilbert 2012-08-13 18:17:55 -07:00
Kyle Machulis
6f53c1980f Bug 781692: Always fire DOMRequests for Set functions in BluetoothAdapter 2012-08-13 17:57:54 -07:00
David Anderson
efd9a9feee Merge from mozilla-central. 2012-08-10 14:50:20 -07:00
David Anderson
b620fb6c5c Merge from mozilla-central. 2012-08-09 13:41:13 -07:00
Ed Morley
61bd42dc2d Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-08-09 12:46:05 +01:00
Ms2ger
715982189c Bug 781058 - Part c: Fix -Werror=int-to-pointer-cast in nsDOMClassInfo; r=mounir 2012-08-09 09:20:29 +02:00
Ms2ger
eb7c7586ef Bug 781058 - Part b: Fix -Werror=int-to-pointer-cast in PluginInstanceParent; r=mounir 2012-08-09 09:20:23 +02:00
Ms2ger
deec9a1e06 Bug 781058 - Part a: Fix -Werror=int-to-pointer-cast in nsPluginNativeWindowGtk2; r=mounir 2012-08-09 09:20:18 +02:00
Ms2ger
bd3a2cb985 Bug 780146 - Part e: Move all standard classes resolution code into the !ObjectIsNativeWrapper() branch; r=jst 2012-08-09 09:19:53 +02:00
Ms2ger
24cde4edab Bug 780146 - Part c: Don't define constructors by contract ID; r=jst 2012-08-09 09:19:48 +02:00
Ms2ger
9e11b31437 Bug 780146 - Part b: Inline nsDOMClassInfo::RegisterClassName; r=jst 2012-08-09 09:19:42 +02:00
Ms2ger
f2dfacfb24 Bug 780146 - Part a: Move window._content into IDL; r=jst 2012-08-09 09:16:09 +02:00
Ms2ger
e2573fe71e Bug 780993 - Reinstate support for setting indexed properties on HTMLSelectElement to null; r=bz 2012-08-09 09:10:21 +02:00
Ms2ger
17e25febb8 Bug 780387 - Part d: Stop using PRFloat64; r=bsmedberg 2012-08-09 09:09:42 +02:00
Yoshi Huang
1f465934c8 Bug 780825 - Part 2: xpcshell tests. r=vicamo 2012-08-09 14:04:40 +08:00
Dave Hylands
a0645a98d9 Bug 781978 - Automounter should initialize ums.mode to zero. r=gwagner 
From 5eb48be9af695ac2135b8508edb8a4b1e83acb56 Mon Sep 17 00:00:00 2001
 r=gwagner
---
 dom/system/gonk/AutoMounter.cpp        |   19 ++++++++++++++++---
 dom/system/gonk/AutoMounterSetting.cpp |    7 +++++--
 dom/system/gonk/Volume.cpp             |   12 +++++++++---
 dom/system/gonk/nsVolumeService.cpp    |   11 +++++++++--
 4 files changed, 39 insertions(+), 10 deletions(-)
 2012-08-08 15:44:59 -07:00
Justin Lebar
6b929a405a Bug 781320 - Part 4: Test that <iframe mozbrowser>'s name attribute is set when the iframe is created as a result of window.open. r=smaug 2012-08-13 15:19:10 -04:00
Justin Lebar
a74e85d8f6 Bug 781320 - Part 3: Set <iframe mozbrowser>'s name for iframes created via window.open. r=smaug 2012-08-13 15:19:10 -04:00
Justin Lebar
a4f59b9ee7 Bug 781320 - Part 2: Tests for forwarding <iframe mozbrowser>'s name from parent to child. r=smaug 2012-08-13 15:19:09 -04:00
Justin Lebar
37bc18bddb Bug 781320 - Part 1: Sync iframe name down from parent to child in <iframe mozbrowser>. r=smaug 2012-08-13 15:19:09 -04:00
Justin Lebar
0c3ea3ef65 Bug 780351 - Tests for ensuring that mozapp divides the window name namespace, but mozbrowser does not. r=smaug 2012-08-13 15:19:09 -04:00
Justin Lebar
b03cc92154 Bug 780546 - Add test for opening named windows inside <iframe mozbrowser>. r=mounir 2012-08-13 15:19:09 -04:00
Justin Lebar
c42222b728 No bug - Tweak dom/browser-element/mochitest/createNewTest.py. r=me DONTBUILD 2012-08-13 15:19:08 -04:00
Neil Deakin
9b35869d1b Bug 391834, don't allow prompts in beforeunload, unload and pagehide events,r=smaug,patch mostly by gavin 2012-08-13 15:05:34 -04:00
Neil Deakin
783b418a43 Bug 391834, rearrange some popup dialog code to be simpler,r=smaug,patch mostly by gavin 2012-08-13 15:03:59 -04:00
Justin Lebar
0a712a72f1 Bug 777135 - Part 3: Remove nsDOMWindowUtils::GetIsApp and friends. r=mounir 
--HG--
extra : rebase_source : ac3db88b7eb03397c4ae514624e1f3021947c396
 2012-08-13 12:58:38 -04:00
Justin Lebar
0d4822afe2 Bug 777135 - Part 2: Stop using nsDOMWindowUtils::GetIsApp and friends, and instead use the relevant methods on the principal. r=mounir 
--HG--
extra : rebase_source : fa8a153a1edc8f64b230b67f121ba5eaaf1098e6
 2012-08-13 12:58:38 -04:00
David Anderson
c9ca5124db Merge from mozilla-central. 2012-08-08 15:09:49 -07:00
Ehsan Akhgari
5b76a146bc Bug 579517 - Part 5: Add missing StandardInteger.h #includes where needed; r=bsmedberg 
Landing on a CLOSED TREE
 2012-08-08 17:08:17 -04:00
Ehsan Akhgari
2795937cf4 Bug 579517 - Part 4: Manually rewrite some parts of the code base not covered by the automated conversion; r=bsmedberg 2012-08-22 11:59:54 -04:00
Ehsan Akhgari
0fd9123eac Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg 
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
 2012-08-22 11:56:38 -04:00
Donovan Preston
bc56dc9adb Bug 733573 - Expose a client TCP socket API to web applications [r=honzab,fabrice] 2012-08-21 09:46:27 -07:00
Ed Morley
3073a11a52 Backout 3c39fdebf386 (bug 733573) for native Android m3 failures in test_tcpsocket_enabled_no_perm.html on a CLOSED TREE 2012-08-21 23:01:09 +01:00
Ed Morley
3197149f5c Merge mozilla-central to mozilla-inbound 2012-08-21 21:16:49 +01:00
Nick Desaulniers
2a8f741998 Bug 784245 - change uuid's for webapplicationregistry [r=fabrice] 2012-08-21 10:56:47 -07:00
Donovan Preston
ff04ad6299 Bug 733573 - Expose a client TCP socket API to web applications [r=honzab,fabrice] 2012-08-21 09:46:27 -07:00
Aryeh Gregor
f638ada4c3 Bug 783863 - ArchiveInputStream::Tell incorrectly uses mStatus as an nsresult; r=baku 2012-08-21 14:56:39 +03:00
Georg Fritzsche
6d3f51f08a Bug 781124 - Report CPU usage for hung flash processes. r=bsmedberg 2012-08-09 12:36:30 +02:00
Georg Fritzsche
3dfa8d43e7 Bug 781133 - Fix locale specific numbers in hung plugin CPU usage reporting. r=bsmedberg 2012-08-09 11:04:27 +02:00
Paul Adenot
9670c86dc2 Bug 775319 - Determine the sample format at compile time for all media code. r=kinetik 2012-08-16 18:10:36 -07:00
Ed Morley
969a047a7e Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-08-08 17:18:26 +01:00
Yoshi Huang
1da6a72d47 Bug 780825 - Part 1: Read 0x81 and 0x82 UCS2 String on UICC. r=vicamo 2012-08-08 12:20:54 +08:00
David Anderson
3ffd33a2cb Merge from mozilla-central. 2012-08-07 15:13:28 -07:00
Johnny Stenback
c47778def6 Backing out 77e5cdc7af9a due to it landing w/o following our code checkin process. 2012-08-07 09:11:04 -07:00
Aryeh Gregor
55f612abce Bug 743573 - Followup: Fix build warnings in gcc 4.6.3; r=Ms2ger 2012-08-07 11:37:54 +02:00
Ms2ger
5cd10c6422 Merge m-c to m-i. 2012-08-07 10:30:48 +02:00