Merge pull request #1183 from DonLakeFlyer/SettingsFix

Fixing bogus push of SettingsDialog.ui for merge hell

Merge pull request #1183 from DonLakeFlyer/SettingsFix
Fixing bogus push of SettingsDialog.ui for merge hell
808a835d · Don Gagne · 9d73e721 · 3165ab60 · 808a835d
Commit 808a835d authored Feb 02, 2015 by Don Gagne
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 242 deletions

SettingsDialog.ui src/ui/SettingsDialog.ui +0 -242

No files found.
--- a/src/ui/SettingsDialog.ui
+++ b/src/ui/SettingsDialog.ui