Merge branch 'master' into fix-asset-explorer-icon-overlay-highdpi

StanleyGoldman · web-flow · commit e5280cdba194 · 2018-08-13T10:15:12.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
@@ -494,7 +494,6 @@ public static GUIStyle ToolbarButtonStyle
                     toolbarButtonStyle = new GUIStyle(EditorStyles.toolbarButton);
                     toolbarButtonStyle.name = "HistoryToolbarButtonStyle";
                     toolbarButtonStyle.richText = true;
-                    toolbarButtonStyle.wordWrap = true;
                 }
                 return toolbarButtonStyle;
             }

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,6 @@ public static GUIStyle ToolbarButtonStyle`
`494`	`494`	`toolbarButtonStyle = new GUIStyle(EditorStyles.toolbarButton);`
`495`	`495`	`toolbarButtonStyle.name = "HistoryToolbarButtonStyle";`
`496`	`496`	`toolbarButtonStyle.richText = true;`
`497`		`- toolbarButtonStyle.wordWrap = true;`
`498`	`497`	`}`
`499`	`498`	`return toolbarButtonStyle;`
`500`	`499`	`}`