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
Scan documents to PDF and more, as simply as possible.
324 Commits 3 Branches 97 Tags 117 MiB
C# 81.4%
Inno Setup 18.5%
8d608a7262
Go to file
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
.nuget Configured solution for package restore and updated reference paths 2013-07-01 11:25:39 -04:00
NAPS2 Merge branch 'master' into separate_projects 2014-10-14 18:07:16 -04:00
NAPS2.Console Merge branch 'master' into separate_projects 2013-11-30 14:54:43 -05:00
NAPS2.Core Merge branch 'master' into separate_projects 2014-10-14 18:07:16 -04:00
NAPS2.Setup Merge branch 'master' into separate_projects 2013-11-30 14:54:43 -05:00
NAPS2.Tests Moved most code from the NAPS2 project to a new NAPS2.Core project, without Ninject/NLog dependencies. 2013-11-30 14:44:17 -05:00
.gitignore Updated gitignore 2013-03-06 21:44:49 -05:00
NAPS2.sln Moved most code from the NAPS2 project to a new NAPS2.Core project, without Ninject/NLog dependencies. 2013-11-30 14:44:17 -05:00
NAPS2.sln.DotSettings Added logging configuration. Added logging to unhandled and unknown exceptions. Improved/re-organized exception handling to facilitate this. 2013-07-07 15:59:28 -04:00
version.xml Merge branch 'master' into auto_update 2013-09-22 13:16:35 -04:00