Gregory Hainaut 1ee8130ffa Merge branch 'master' of git://github.com/josephgbr/pcsx2 into josephgbr-master ... greg: resolve conflict Conflicts: locales/pt_BR/pcsx2_Iconized.po locales/pt_BR/pcsx2_Main.po		2015-12-23 17:56:21 +01:00
..
pcsx2_Iconized.po	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
pcsx2_Main.po	Merge branch 'master' of git://github.com/josephgbr/pcsx2 into josephgbr-master	2015-12-23 17:56:21 +01:00