Merge remote-tracking branch 'origin/master' into dotnet45

Browse Source

...

This commit is contained in:

bao-qian

2015-11-26 07:42:09 +00:00

parent e29f53a82d e5e64a4b6d

commit 4526378b33

2 changed files with 6 additions and 6 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

BIN

Plugins/Wox.Plugin.WebSearch/Images/google.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.8 KiB