Skip to content
Snippets Groups Projects
Commit 794129e0 authored by tobias's avatar tobias
Browse files

Merge branch 'paging' into dev-6-0

Conflicts:
	PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties
	PlayWall/src/application.yml
	PlayWall/src/de/tobias/playpad/PlayPadImpl.java
	PlayWall/src/de/tobias/playpad/PlayPadMain.java
	PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
	PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
	PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
	PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java
	PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
	PlayWall/src/de/tobias/playpad/viewcontroller/cell/ProjectCell.java
	PlayWall/src/de/tobias/playpad/viewcontroller/cell/errordialog/FixCell.java
	PlayWall/src/de/tobias/playpad/viewcontroller/dialog/NewProjectDialog.java
	PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MidiTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java
	PlayWall/src/de/tobias/playpad/viewcontroller/pad/PadDragListener.java
	PlayWallCore/src/de/tobias/playpad/action/Mapping.java
	PlayWallCore/src/de/tobias/playpad/design/GlobalDesign.java
	PlayWallCore/src/de/tobias/playpad/pad/Pad.java
	PlayWallCore/src/de/tobias/playpad/project/Project.java
	PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java
	PlayWallCore/src/de/tobias/playpad/project/ProjectReferenceList.java
	PlayWallCore/src/de/tobias/playpad/project/ProjectReferenceSerializer.java
	PlayWallCore/src/de/tobias/playpad/viewcontroller/option/GlobalSettingsTabViewController.java
	PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProfileSettingsTabViewController.java
	PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProjectSettingsTabViewController.java
	PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
parents 8b475809 a5648e5c
No related branches found
No related tags found
No related merge requests found
Showing
with 205 additions and 142 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment