6 Commits

Author	SHA1	Message	Date
Ben Marsh	149375b14b	Update copyright notices to 2015. ... [CL 2379638 by Ben Marsh in Main branch]	2014-12-07 19:09:38 -05:00
Dan Oconnor	79165ed057	#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge ... [CL 2116875 by Dan Oconnor in Main branch]	2014-06-25 13:25:21 -04:00
Jaroslaw Palczynski	ebce413232	UE4 Refactoring. Changed OVERRIDE and FINAL macros to keywords override and final. ... [CL 2104397 by Jaroslaw Palczynski in Main branch]	2014-06-13 06:14:46 -04:00
Thomas Sarkanen	e27e005773	Source control copies now integrate/copy instead of Delete + Add ... TTP# 334923 - EDITOR: Perforce Integration (Move -> Delete + Add instead of Integrate) New API: Added ISourceControlRevision::GetBranchSource. Made sure the P4 and SVN providers perform integrates/copies so that history is maintained across file copies & moves. Also fixed SCC icons not refreshing sometimes until source control operation has completed. Added new branch icon. Fixed date display in history. This required some fairly nasty fixup to get it all working within the Editor copy code path, but the majority of the changes are in the source control providers. reviewed by Andrew.Brown [CL 2095604 by Thomas Sarkanen in Main branch]	2014-06-05 12:10:47 -04:00
UnrealBot	db494a6e69	Engine source (Main branch up to CL 2037954)	2014-04-02 18:09:23 -04:00
Tim Sweeney	324683ce78	Engine source (Main branch up to CL 2026164)	2014-03-14 14:13:41 -04:00