Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions

View file

@ -25,14 +25,14 @@ using System.Windows.Forms;
namespace Greenshot.Plugin {
public class ExportInformation {
private string uri = null;
private string filepath = null;
private string uri;
private string filepath;
private bool exportMade = false;
private string destinationDesignation = null;
private string destinationDescription = null;
private bool exportMade;
private readonly string destinationDesignation;
private string destinationDescription;
private string errorMessage = null;
private string errorMessage;
public ExportInformation(string destinationDesignation, string destinationDescription) {
this.destinationDesignation = destinationDesignation;