Revision 0875ca3b - Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/j... - TwistyPuzzleLib - Distorted Android

« Previous | Next »

Revision 0875ca3b

Added by Leszek Koltunski 8 months ago

ID 0875ca3b13b355fc40146fd90a8fd08af01fe38a
Parent 29e080fc, 43120806
Child 031949ea

Merge remote-tracking branch 'origin/master'

Conflicts:
src/main/java/org/distorted/objectlib/metadata/ListObjects.java
src/main/java/org/distorted/objectlib/metadata/MetadataGHOS_2.java
src/main/java/org/distorted/objectlib/objects/TwistyGhostCube.java

Changes

added
modified
copied
renamed
deleted