Merge branch 'master' of https://github.com/malensek/3RVX

malensek · malensek · commit c1de50f9aa5d · 2015-03-26T23:30:19.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ Beta 6
 * Allows shell hotkeys to be overridden (if desired)
 * 'All Monitors' display option has been implemented
 * Adds development option to log to file
+* Media hotkey emulation
 
 Beta 5
 ------
