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

Merge branch 'file-loading' into dev-6-0

Conflicts:
	PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties
	PlayWall/src/de/tobias/playpad/PlayPadImpl.java
	PlayWall/src/de/tobias/playpad/PlayPadMain.java
	PlayWallCore/src/de/tobias/playpad/Updatable.java
	PlayWallCore/src/de/tobias/playpad/action/ActionSerializer.java
	PlayWallCore/src/de/tobias/playpad/pad/PadSerializer.java
	PlayWallCore/src/de/tobias/playpad/project/Project.java
	PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java
	PlayWallCore/src/de/tobias/playpad/project/ProjectReferenceSerializer.java
	PlayWallCore/src/de/tobias/playpad/settings/ProfileReference.java
	PlayWallCore/src/de/tobias/playpad/settings/ProfileReferenceSerializer.java
parents 0849119e 06c6ef2f
No related branches found
No related tags found
No related merge requests found
Showing
with 162 additions and 97 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment