Project

General

Profile

« Previous | Next » 

Revision 56de0b66

Added by Leszek Koltunski about 4 years ago

Merge remote-tracking branch 'origin/tutorial'

  1. Conflicts:
  2. src/main/java/org/distorted/dialogs/RubikDialogInfo.java
  3. src/main/java/org/distorted/states/RubikStateBase.java
  4. src/main/java/org/distorted/tutorial/TutorialActivity.java
  5. src/main/java/org/distorted/tutorial/TutorialPreRender.java
  6. src/main/java/org/distorted/tutorial/TutorialRenderer.java
  7. src/main/java/org/distorted/tutorial/TutorialSurfaceView.java
  8. src/main/res/layout/tutorial.xml
  • added
  • modified
  • copied
  • renamed
  • deleted