diff options
| author |  bunnei <ericbunnie@gmail.com> | 2014-06-14 12:13:16 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-06-14 12:13:16 -0400 |
| commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
| tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /.gitignore | |
| parent | c34ba380011921a9d984136381c3a65a1e2389d5 (diff) | |
| parent | b45a38f55794e47b0429a8667441a20433e19e42 (diff) | |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions