summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-09-22 16:17:02 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-09-22 16:17:02 -0300
commitc1fa3959fbffb381e067dcd619d528412e235401 (patch)
tree72662a8d2102dd782d68006d69e3b3058d8bd899 /changes
parent30fe51fa5c90a5ec08491b6d3f8524838ec75ac2 (diff)
parent668a9f9aa327c3c055b9e0f641f8c33d59e1c452 (diff)
Merge remote-tracking branch 'elijah/feature/prefui' into develop
Diffstat (limited to 'changes')
-rw-r--r--changes/feature-combined-preferences-window1
1 files changed, 1 insertions, 0 deletions
diff --git a/changes/feature-combined-preferences-window b/changes/feature-combined-preferences-window
new file mode 100644
index 00000000..146ac923
--- /dev/null
+++ b/changes/feature-combined-preferences-window
@@ -0,0 +1 @@
+- single combined preferences window (closes #4704, #4119, #5885) \ No newline at end of file