Merge remote-tracking branch 'origin/master'

# Conflicts:
#	OneLoneCoder_Tetris.cpp
This commit is contained in:
OneLoneCoder 2017-05-23 18:46:03 +01:00
commit cb2401e72c
2 changed files with 3 additions and 2 deletions

View File

@ -134,4 +134,4 @@ int main()
LogiLcdShutdown();
return 0;
}
}

View File

@ -267,4 +267,5 @@ int main()
cout << "Game Over!! Score:" << nScore << endl;
system("pause");
return 0;
}
}