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

Merge branch 'fading' into dev-6-0 

Conflicts:
	PlayWall/src/de/tobias/playpad/PlayPadMain.java
	PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
	PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
	PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java
parents 794129e0 ffc5f1b3
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 285 additions and 130 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment