Commit 9ba39d3

committed

Merge branch 'Shortcuts' into ShortcutDialog

# Conflicts: # FlashDevelop/Dialogs/ShortcutDialog.cs

2 parents a74af62 + f97a456 commit 9ba39d3Copy full SHA for 9ba39d3

1 file changed

+240

-192

lines changed

+240

-192

lines changed

Comments

(0)