mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 01:48:05 +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. |
||
---|---|---|
.. | ||
test | ||
BatteryManager.cpp | ||
BatteryManager.h | ||
Constants.h | ||
Makefile.in | ||
moz.build | ||
nsINavigatorBattery.idl | ||
Types.h |