diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-07-11 15:24:44 +0200 |
| commit | 96d49d84aafecd78c902681f20de6207badf7e85 (patch) | |
| tree | 7a835fce4f264c6c0886441c4f79e02cdf47582c /test/unit/graphics/core/device_mock.h | |
| parent | 5223ef1fb116780298495a4d2f63e6c2c39fdfbd (diff) | |
| parent | 852223262055440569ecca70f1b9da46089424c4 (diff) | |
| download | colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.gz colobot-96d49d84aafecd78c902681f20de6207badf7e85.tar.bz2 colobot-96d49d84aafecd78c902681f20de6207badf7e85.zip | |
Merge branch 'dev' into dev-physfs
Conflicts:
data
src/app/gamedata.cpp
src/ui/control.cpp
src/ui/edit.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'test/unit/graphics/core/device_mock.h')
| -rw-r--r-- | test/unit/graphics/core/device_mock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/unit/graphics/core/device_mock.h b/test/unit/graphics/core/device_mock.h index 9e75daf..498239f 100644 --- a/test/unit/graphics/core/device_mock.h +++ b/test/unit/graphics/core/device_mock.h @@ -105,4 +105,6 @@ public: MOCK_METHOD1(SetFillMode, void(Gfx::FillMode mode)); MOCK_METHOD0(GetFillMode, Gfx::FillMode()); + + MOCK_CONST_METHOD0(GetFrameBufferPixels, void*()); }; |