cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-11-13 06:27:11 +03:00
Code Issues Packages Projects Releases Wiki Activity
a88f8d8adc
naps2/NAPS2.Setup
History
Ben Olden-Cooligan 3966250c82 Merge remote-tracking branch 'remotes/Gitlab/master' into scancontroller 
# Conflicts:
#	NAPS2.Console/NAPS2.Console.csproj
#	NAPS2.Core/ImportExport/Email/Mapi/MapiEmailProvider.cs
#	NAPS2.Core/ImportExport/Email/Mapi/MapiWrapper.cs
#	NAPS2.Core/WinForms/FDesktop.Designer.cs
#	NAPS2.Core/WinForms/FDesktop.cs
#	NAPS2.Core/WinForms/FDesktop.resx
#	NAPS2/NAPS2.csproj
#	NAPS2/Setup/naps2.ps1
2019-05-02 19:04:05 -04:00
..
lib Add grpc to msi 2019-04-12 21:56:12 -04:00
Properties Fix setup project weirdness 2018-12-16 21:39:11 -05:00
.gitignore Added NAPS2.Setup WIX project. 2013-07-25 16:18:24 -04:00
Build-Test.ps1 Fix script paths 2018-11-29 22:47:30 -05:00
CommonTargets.targets Restructure projects 2018-11-25 12:37:54 -05:00
LanguageComponents.tt Fix msi build 2019-04-12 21:28:22 -04:00
LanguageComponents.wxs Fix msi build 2019-04-12 21:28:22 -04:00
license.rtf Restructure projects 2018-11-25 12:37:54 -05:00
naps2.ps1 Merge remote-tracking branch 'remotes/Gitlab/master' into scancontroller 2019-05-02 19:04:05 -04:00
NAPS2.Setup.csproj Add grpc to msi 2019-04-12 21:56:12 -04:00
ps.bat Restructure projects 2018-11-25 12:37:54 -05:00
Publish-NAPS2.ps1 Restructure projects 2018-11-25 12:37:54 -05:00
setup.iss Merge branch 'master' into modern 2018-12-16 21:56:21 -05:00
setup.languagefiles.iss Restructure projects 2018-11-25 12:37:54 -05:00
setup.languagefiles.tt Restructure projects 2018-11-25 12:37:54 -05:00
Test-Lang.ps1 Merge branch 'master' into modern 2018-12-16 21:56:21 -05:00
Update-Resources.ps1 Fix script paths 2018-11-29 22:47:30 -05:00
Update-Templates.ps1 Fix script paths 2018-11-29 22:47:30 -05:00
WIA-Build.ps1 Fix script paths 2018-11-29 22:47:30 -05:00