Merge branch 'prototype' into 'feature-osMoveMouse'
# Conflicts: # src/Controller/RunHotkeys.java
No related branches found
No related tags found
Showing
- src/Controller/Action.java 0 additions, 32 deletionssrc/Controller/Action.java
- src/Controller/Binding.java 43 additions, 0 deletionssrc/Controller/Binding.java
- src/Controller/KeyConversion.java 0 additions, 149 deletionssrc/Controller/KeyConversion.java
- src/Controller/KeyListener.java 0 additions, 33 deletionssrc/Controller/KeyListener.java
- src/Controller/RunHotkeys.java 14 additions, 37 deletionssrc/Controller/RunHotkeys.java
- src/Main.java 7 additions, 3 deletionssrc/Main.java
- src/ui/BlankView.java 0 additions, 10 deletionssrc/ui/BlankView.java
- src/ui/KeyValueMap.java 1 addition, 1 deletionsrc/ui/KeyValueMap.java
- src/ui/MacroView.java 0 additions, 54 deletionssrc/ui/MacroView.java
- src/ui/MainScreen.java 85 additions, 314 deletionssrc/ui/MainScreen.java
Loading
Please register or sign in to comment