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

@ -26,7 +26,7 @@ namespace GreenshotPlugin.Core {
/// Centralized storage of the icons & bitmaps
/// </summary>
public static class GreenshotResources {
private static ComponentResourceManager greenshotResources = new ComponentResourceManager(typeof(GreenshotResources));
private static readonly ComponentResourceManager greenshotResources = new ComponentResourceManager(typeof(GreenshotResources));
public static Image getImage(string imageName) {
return (Image)greenshotResources.GetObject(imageName);