a74dd2d129
# Conflicts: # Mac/Base.lproj/Preferences.storyboard |
||
---|---|---|
.. | ||
ExtensionPointEnableBasicWindowController.swift | ||
ExtensionPointMarsEditWindowController.swift |
a74dd2d129
# Conflicts: # Mac/Base.lproj/Preferences.storyboard |
||
---|---|---|
.. | ||
ExtensionPointEnableBasicWindowController.swift | ||
ExtensionPointMarsEditWindowController.swift |