Revision 789f600f - Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/or... - Distorted Android

« Previous | Next »

Revision 789f600f

Added by Leszek Koltunski about 8 years ago

ID 789f600fcde6e32c884b74cab2d81381799c1988
Parent eada161a, 61ec8208
Child f6cac1f6

Merge remote-tracking branch 'origin/master'

Conflicts:
src/main/java/org/distorted/library/EffectNames.java

Changes

added
modified
copied
renamed
deleted