Fixed .gitignore and modified the app.config so MAYBE it isn't modified automatically by VS.

This commit is contained in:
RKrom 2014-05-30 11:14:23 +02:00
commit 7cbb0fd2eb
3 changed files with 19 additions and 18 deletions

5
.gitignore vendored
View file

@ -10,8 +10,9 @@ obj/
fugue/ fugue/
*Credentials.private.cs *Credentials.private.cs
*Credentials.orig.cs *Credentials.orig.cs
upgradeLog*.htm /Greenshot/UpgradeLog*.htm
upgradeLog*.XML /Greenshot/UpgradeLog*.XML
/Greenshot/_UpgradeReport_Files/*
*.log *.log
/Greenshot/releases/additional_files/readme.txt /Greenshot/releases/additional_files/readme.txt
/*.error /*.error

View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup useLegacyV2RuntimeActivationPolicy="true"> <startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0"/> <supportedRuntime version="v4.0"/>
<supportedRuntime version="v2.0.50727"/> <supportedRuntime version="v2.0.50727"/>
</startup> </startup>
<runtime> <runtime>
<loadFromRemoteSources enabled="true"/> <loadFromRemoteSources enabled="true"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="App\Greenshot"/> <probing privatePath="App\Greenshot"/>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup useLegacyV2RuntimeActivationPolicy="true"> <startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0"/> <supportedRuntime version="v4.0"/>
<supportedRuntime version="v2.0.50727"/> <supportedRuntime version="v2.0.50727"/>
</startup> </startup>
<runtime> <runtime>
<loadFromRemoteSources enabled="true"/> <loadFromRemoteSources enabled="true"/>
</runtime> </runtime>
</configuration> </configuration>