diff options
| author | Scott Mansell <phiren@gmail.com> | 2013-11-23 23:20:45 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2013-11-23 23:20:45 +1300 |
| commit | 786e49ed4867ce37c1e0a4eb82079b45c1c6e844 (patch) | |
| tree | d970fa7fd78ca1897d5116c8f10b9b5fac84a76b /Source/Core/InputCommon/ControllerInterface/Device.cpp | |
| parent | 999e085411b7252b5db131cbde2bcecb63e3bc3b (diff) | |
| parent | 672fa65ee76c0addb31b8c8cacc129a76926331d (diff) | |
Merge branch 'master' into videosoftware-xfb
Conflicts:
Source/Core/VideoBackends/Software/Src/EfbCopy.cpp
Source/Core/VideoBackends/Software/Src/SWRenderer.cpp
Source/Core/VideoBackends/Software/Src/SWRenderer.h
Source/Core/VideoBackends/Software/Src/SWVideoConfig.cpp
Source/Core/VideoBackends/Software/Src/SWmain.cpp
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
0 files changed, 0 insertions, 0 deletions