Merge pull request #11 from notaz/upstream_merge
[pcsx_rearmed.git] / plugins / dfinput / main.c
2011-08-12 notazadd guncon support