-
- Downloads
Merge branch 'prototype' into 'feature-Implement-DetectProgram'
# Conflicts: # src/ui/MainScreen.java
Showing
- src/Controller/Action.java 35 additions, 3 deletionssrc/Controller/Action.java
- src/Controller/KeyListener.java 8 additions, 3 deletionssrc/Controller/KeyListener.java
- src/Controller/mouseAction.java 4 additions, 4 deletionssrc/Controller/mouseAction.java
- src/model/MouseButtons.java 64 additions, 0 deletionssrc/model/MouseButtons.java
- src/model/OSInterface.java 97 additions, 66 deletionssrc/model/OSInterface.java
- src/model/ProgramLaunchConverter.java 65 additions, 0 deletionssrc/model/ProgramLaunchConverter.java
- src/model/profiles/commands/addHotkey.java 3 additions, 2 deletionssrc/model/profiles/commands/addHotkey.java
- src/model/profiles/commands/getHotkey.java 5 additions, 4 deletionssrc/model/profiles/commands/getHotkey.java
- src/model/profiles/commands/saveEverything.java 18 additions, 9 deletionssrc/model/profiles/commands/saveEverything.java
- src/model/profiles/entities/profile.java 17 additions, 17 deletionssrc/model/profiles/entities/profile.java
- src/ui/KeyValueMap.java 4 additions, 1 deletionsrc/ui/KeyValueMap.java
- src/ui/MainScreen.java 58 additions, 18 deletionssrc/ui/MainScreen.java
- src/ui/OptionsList.java 1 addition, 1 deletionsrc/ui/OptionsList.java
Loading
Please register or sign in to comment