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

Browse source

...

This commit is contained in:

Robin 2016-05-24 13:13:48 +02:00

parent 01d59ad602 45615275cf

commit 0323705513

276 changed files with 5382 additions and 3666 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

827

Greenshot/Forms/ImageEditorForm.cs

View file

File diff suppressed because it is too large Load diff