55ca38d45f
Conflicts: gui/dialogs/location-in-air.xml |
||
---|---|---|
.. | ||
dialogs | ||
styles | ||
menubar.xml | ||
menubar.xml.alt |
55ca38d45f
Conflicts: gui/dialogs/location-in-air.xml |
||
---|---|---|
.. | ||
dialogs | ||
styles | ||
menubar.xml | ||
menubar.xml.alt |