mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-12 14:37:50 +00:00
de55b5242b
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. |
||
---|---|---|
.. | ||
bridge | ||
tests | ||
Makefile.in | ||
MediaManager.cpp | ||
MediaManager.h | ||
moz.build | ||
nsIDOMMediaStream.idl | ||
nsIDOMNavigatorUserMedia.idl | ||
nsIDOMRTCPeerConnection.idl | ||
nsIMediaManager.idl | ||
PeerConnection.js | ||
PeerConnection.manifest |