Skip to content
Commit 53eda077 authored by Don Gagne's avatar Don Gagne
Browse files

Merge remote-tracking branch 'origin/ACWork' into ACWork 

# Conflicts:
#	src/ui/SettingsDialog.cc
#	src/ui/SettingsDialog.ui
parents 97be5b45 e00c0f69
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment