diff options
author | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-08-07 20:11:27 -0400 |
commit | c05c42ecc60c8f928628787272743f169a0d5903 (patch) | |
tree | f2b06be630676b7302a1fb62940099b2ec71442d /test/cxxtest/sample/mock | |
parent | e43a6671fc04f2c67b8efa2c0fdfdd6ec0ea1023 (diff) | |
parent | 45dc303159d5bbe77a351df31e6f2d2f97a3412d (diff) | |
download | scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.gz scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.tar.bz2 scummvm-rg350-c05c42ecc60c8f928628787272743f169a0d5903.zip |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'test/cxxtest/sample/mock')
-rw-r--r-- | test/cxxtest/sample/mock/Dice.cpp | 2 | ||||
-rw-r--r-- | test/cxxtest/sample/mock/Dice.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/test/cxxtest/sample/mock/Dice.cpp b/test/cxxtest/sample/mock/Dice.cpp index 161b80fa2b..afd0641ac1 100644 --- a/test/cxxtest/sample/mock/Dice.cpp +++ b/test/cxxtest/sample/mock/Dice.cpp @@ -10,5 +10,3 @@ unsigned Dice::roll() { return (T::rand() % 6) + 1; } - - diff --git a/test/cxxtest/sample/mock/Dice.h b/test/cxxtest/sample/mock/Dice.h index 3a393ef262..2ffd2562c5 100644 --- a/test/cxxtest/sample/mock/Dice.h +++ b/test/cxxtest/sample/mock/Dice.h @@ -10,4 +10,3 @@ public: }; #endif // __DICE_H - |