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

@ -20,7 +20,6 @@
*/
using System;
using System.Runtime.InteropServices;
using Greenshot.Interop;
namespace Greenshot.Interop {
// This is used for Windows 8 to see if the App Launcher is active