-
- Downloads
Merge branch 'master' into develop
# Conflicts: # .idea/encodings.xml
No related branches found
No related tags found
Showing
- .idea/encodings.xml 0 additions, 1 deletion.idea/encodings.xml
- .idea/misc.xml 0 additions, 14 deletions.idea/misc.xml
- PlayWall/pom.xml 7 additions, 7 deletionsPlayWall/pom.xml
- PlayWall/src/main/java/de/tobias/playpad/Strings.java 0 additions, 4 deletionsPlayWall/src/main/java/de/tobias/playpad/Strings.java
- PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java 25 additions, 15 deletions...ypad/layout/desktop/DesktopMenuToolbarViewController.java
- PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java 4 additions, 0 deletions.../playpad/layout/touch/TouchMenuToolbarViewController.java
- PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java 1 addition, 0 deletions...obias/playpad/viewcontroller/main/MainViewController.java
- PlayWall/src/main/resources/repository.yml 1 addition, 1 deletionPlayWall/src/main/resources/repository.yml
- PlayWallComponents/pom.xml 5 additions, 5 deletionsPlayWallComponents/pom.xml
- PlayWallCore/pom.xml 5 additions, 5 deletionsPlayWallCore/pom.xml
- PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java 2 additions, 0 deletions...laypad/viewcontroller/main/MenuToolbarViewController.java
- PlayWallPlugins/PlayWallPluginAwake/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginAwake/pom.xml
- PlayWallPlugins/PlayWallPluginEqualizer/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginEqualizer/pom.xml
- PlayWallPlugins/PlayWallPluginLaunchpad/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginLaunchpad/pom.xml
- PlayWallPlugins/PlayWallPluginMedia/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginMedia/pom.xml
- PlayWallPlugins/PlayWallPluginNativeAudio/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginNativeAudio/pom.xml
- PlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginPlayoutLog/pom.xml
- PlayWallPlugins/PlayWallPluginWebAPI/pom.xml 5 additions, 5 deletionsPlayWallPlugins/PlayWallPluginWebAPI/pom.xml
- PlayWallPlugins/pom.xml 1 addition, 1 deletionPlayWallPlugins/pom.xml
- pom.xml 18 additions, 18 deletionspom.xml
Loading
Please register or sign in to comment