mirror of https://github.com/PCSX2/pcsx2.git
062212952d
Greg: merge & conflict stuff |
||
---|---|---|
.. | ||
pcsx2_Iconized.po | ||
pcsx2_Main.po |
062212952d
Greg: merge & conflict stuff |
||
---|---|---|
.. | ||
pcsx2_Iconized.po | ||
pcsx2_Main.po |