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

Merge branch 'edit-mode' into dev-6-0 

Conflicts:
	PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
	PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
	PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
	PlayWallCore/src/de/tobias/playpad/project/Project.java
	PlayWallCore/src/de/tobias/playpad/settings/Profile.java
parents e4ebe820 d223459b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 447 additions and 118 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment