cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-05 03:47:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
465 Commits 3 Branches 97 Tags 117 MiB
c0f5929fea
Commit Graph

3 Commits

Author SHA1 Message Date
Ben Olden-Cooligan
7cde12283f Updated language files. 2014-11-13 17:10:30 -05:00
Ben Olden-Cooligan
8d608a7262 Merge branch 'master' into separate_projects 
Conflicts:
	NAPS2.Core/Lang/tmx/bg.tmx
	NAPS2.Core/Lang/tmx/ca.tmx
	NAPS2.Core/Lang/tmx/cs.tmx
	NAPS2.Core/Lang/tmx/da.tmx
	NAPS2.Core/Lang/tmx/de.tmx
	NAPS2.Core/Lang/tmx/empty.tmx
	NAPS2.Core/Lang/tmx/es.tmx
	NAPS2.Core/Lang/tmx/fr.tmx
	NAPS2.Core/Lang/tmx/he.tmx
	NAPS2.Core/Lang/tmx/it.tmx
	NAPS2.Core/Lang/tmx/pl.tmx
	NAPS2.Core/Lang/tmx/pt-BR.tmx
	NAPS2.Core/Lang/tmx/pt-PT.tmx
	NAPS2.Core/Lang/tmx/ru.tmx
	NAPS2.Core/Lang/tmx/uk.tmx
	NAPS2/NAPS2.csproj
	NAPS2/WinForms/FDesktop.ru.resx
 2014-10-14 18:07:16 -04:00
Ben Olden-Cooligan
b1fe3288dd Merge branch 'master' into separate_projects 
Conflicts:
	NAPS2/NAPS2.csproj
	NAPS2/Setup/naps2.ps1
	NAPS2/Setup/setup.iss
 2013-11-30 14:54:43 -05:00