Robin 5d56bfab66 Merge branch 'release/1.2.9' ... # Conflicts: # Greenshot/Languages/language-cs-CZ.xml # Greenshot/releases/additional_files/readme.txt.template # GreenshotImgurPlugin/Forms/ImgurHistory.cs # GreenshotImgurPlugin/Forms/SettingsForm.cs # GreenshotImgurPlugin/ImgurConfiguration.cs # GreenshotImgurPlugin/ImgurPlugin.cs # GreenshotImgurPlugin/ImgurUtils.cs # GreenshotPlugin/Core/CoreConfiguration.cs # GreenshotPlugin/Core/ImageHelper.cs # GreenshotPlugin/Core/SourceForgeHelper.cs # GreenshotPlugin/GreenshotPlugin.csproj # appveyor12.yml		2017-01-01 07:41:09 +01:00
..
AbstractFilter.cs	RC2, added the version to the support us and help pages, so we can show that the user is using an outdated version.	2016-11-04 12:48:57 +01:00
BlurFilter.cs	Merge branch 'release/1.2.9'	2017-01-01 07:41:09 +01:00
BrightnessFilter.cs	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00
GrayscaleFilter.cs	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00
HighlightFilter.cs	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00
IFilter.cs	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00
MagnifierFilter.cs	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00
PixelizationFilter.cs	Fixed copyright for this year.	2016-08-17 14:38:41 +02:00