3 Commits

Author	SHA1	Message	Date
Thomas Sarkanen	be75fe1eca	Updated revision display to display strings rather than revision indices ... API break: added new pure virtual ISourceControlProvider::UsesChangelists() API break: added new pure virtual ISourceControlState::FindHistoryRevision(const FString&) API break: added new pure virtual ISourceControlRevision::GetRevision() Implementing a Git provider requires us to be able to display revisions that are not indices as Git revisions are hashes. This updates the relvant code to allow us to display these revisions correctly. [CL 2411986 by Thomas Sarkanen in Main branch]	2015-01-20 05:48:14 -05:00
James Golding	043a3d1c0e	Fix non-unity in MergeUtils.cpp ... #codereview mike.beach #lockdown Zachary.EdgertonJones [CL 2387089 by James Golding in Main branch]	2014-12-12 12:29:52 -05:00
Mike Beach	ca94ad12c3	[UE-5744/UE-5743] Adding a mode to the blueprint merge panel that lets you pick arbitrary blueprints to merge against each other. ... #codereview Dan.OConnor [CL 2385712 by Mike Beach in Main branch]	2014-12-11 12:24:41 -05:00