resolved readme.m conflict to master

2017-11-18 08:36:50 +01:00
parent 037d20096a 03f1fd78e2
commit 204387c42f
23 changed files with 3870 additions and 3684 deletions
--- a/Source/functions/solve/classExtension.cpp
+++ b/Source/functions/solve/classExtension.cpp
@@ -6,6 +6,7 @@ void PuzzlePiece::shift(unsigned int moves)
    setConnections(((getConnections() >> (moves*2)) | (getConnections() << sizeof(unsigned char)*8 - (moves*2))));     
 }

+
 //creates random centerpiece
 void PuzzlePiece::randomCenterPiece()
 {
--- a/Source/functions/solve/structure.cpp
+++ b/Source/functions/solve/structure.cpp
@@ -1,4 +1,5 @@

+
 bool next()
 {