Merge remote-tracking branch 'origin/master'

# Conflicts:
#	OneLoneCoder_Tetris.cpp
master
OneLoneCoder 8 years ago
commit cb2401e72c
  1. 2
      OneLoneCoder_LogitechG13Twitch.cpp
  2. 3
      OneLoneCoder_Tetris.cpp

@ -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…
Cancel
Save