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

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using System.Threading;
using GreenshotPlugin.Core;
@ -30,8 +29,8 @@ namespace GreenshotPlugin.Controls {
/// Description of PleaseWaitForm.
/// </summary>
public partial class PleaseWaitForm : Form {
private static ILog LOG = LogManager.GetLogger(typeof(PleaseWaitForm));
private Thread waitFor = null;
private static readonly ILog LOG = LogManager.GetLogger(typeof(PleaseWaitForm));
private Thread waitFor;
private string title;
public PleaseWaitForm() {
//