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
..
ar_SA	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
ca_ES	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
cs_CZ	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
de_DE	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
es_ES	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
fi_FI	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
fr_FR	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
hr_HR	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
hu_HU	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
id_ID	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
it_IT	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
ja_JP	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
ko_KR	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
ms_MY	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
nb_NO	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
pl_PL	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
pt_BR	Merge branch 'master' of git://github.com/josephgbr/pcsx2 into josephgbr-master	2015-12-23 17:56:21 +01:00
ru_RU	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
sv_SE	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
templates	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
th_TH	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
tr_TR	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
zh_CN	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
zh_TW	i10n: refresh all languages	2015-12-22 16:58:07 +01:00
CMakeLists.txt	cmake: sed /PROJECT_SOURCE_DIR/CMAKE_SOURCE_DIR/	2014-03-30 16:36:02 +02:00
locales.txt	Fixed inconsistent newlines / added as many svn:eol-style=native properties as I could without killing myself.	2011-03-25 05:06:49 +00:00