Merge branch 'master' into vim8

This commit is contained in:
Cyryl Płotnicki 2016-09-15 05:35:57 +02:00 committed by GitHub
commit 743ca1e057

View file

@ -93,11 +93,12 @@ WindowStateMaximised=true
WordWrap=false
[MainWindow]
Height 1080=1081
Height 768=769
Height 900=901
Height 975=976
Height 985=986
State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
ToolBarsMovable=Disabled
Width 1366=1367
Width 1440=1441