Commit Graph

3 Commits

Author SHA1 Message Date
Max Preussner
52e12116c2 Rollback //depot/UE4/Engine/Content/Editor/Slate/Icons/AssetIcons/TileMap_64x.png to revision 1
These files were accidentally deleted as a result of a failed integration between Main and LauncherDev.

[CL 2466855 by Max Preussner in Main branch]
2015-03-02 16:08:07 -05:00
Max Preussner
256933f5ab Merging using UE4-To-UE4-LauncherDev, up to CL 2431138
#CodeReview: carlos.cuello

[CL 2431178 by Max Preussner in Main branch]
2015-02-04 00:28:16 -05:00
Ben Marsh
7e445df208 [INTEGRATE] Change 2420845 by Mike.Fricker@MFRICKER_G3686_Alpha on 2015/01/27 14:53:16
Enabled Git SCC plugin
	- Marked the Git plugin as "Beta" in the UI
	- Fixed Git.exe folder not using correct path separators
	- Added missing icon for SCC plugin
	- Removed experimental setting for Git SCC plugin (the plugin itself is still 'beta' though)
	- Moved README contents into the source code, cleaned it up a bit

[CL 2425776 by Ben Marsh in Main branch]
2015-01-30 10:30:56 -05:00