Revision 6b234228 - Merge branch 'effects-ubo' # Conflicts: # src/main/java/org/distorted/... - Distorted Android

« Previous | Next »

Revision 6b234228

Added by Leszek Koltunski over 4 years ago

ID 6b234228a8957110e9c71dbca7d3088a5034571e
Parent b187afac, 35e7d841
Child a81e5cf7

Merge branch 'effects-ubo'

Conflicts:
src/main/java/org/distorted/library/mesh/AssociationUniformBlock.java

Changes

added
modified
copied
renamed
deleted