Merge remote-tracking branch 'origin/master'
# Conflicts: # OneLoneCoder_Tetris.cpp
This commit is contained in:
commit
cb2401e72c
@ -134,4 +134,4 @@ int main()
|
||||
|
||||
LogiLcdShutdown();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -267,4 +267,5 @@ int main()
|
||||
cout << "Game Over!! Score:" << nScore << endl;
|
||||
system("pause");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user