Ben Marsh
263981ef32
Missing include.
...
[CL 2524633 by Ben Marsh in Main branch]
2015-04-24 13:39:16 -04:00
Dan Oconnor
46337fdf90
[UE-11968] Fix for shutdown of diff and merge tool, as comment explains we are running too much logic on diff tool shutdown
...
[CL 2519851 by Dan Oconnor in Main branch]
2015-04-21 16:06:46 -04:00
Marc Audy
2b0c07e2b3
Fix shadowed variables
...
[CL 2460489 by Marc Audy in Main branch]
2015-02-25 12:55:30 -05:00
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
Ben Marsh
149375b14b
Update copyright notices to 2015.
...
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Mike Beach
10aa6932f9
[UE-5740] The finish/cancel buttons now close out the editor when running the merge tool from command-line.
...
#codereview Dan.OConnor
[CL 2368928 by Mike Beach in Main branch]
2014-11-24 17:38:44 -05:00
Mike Beach
05494d303d
Fixing a mono compiler error.
...
[CL 2367761 by Mike Beach in Main branch]
2014-11-21 13:51:41 -05:00
Mike Beach
809444724a
[UE-5068] Extending the new command-line asset diff command to handle Blueprint merging.
...
#codereview Dan.OConnor
[CL 2367629 by Mike Beach in Main branch]
2014-11-21 12:21:17 -05:00
Joe Conley
13afa18e69
Fixing non-unity build
...
[CL 2363085 by Joe Conley in Main branch]
2014-11-18 03:15:12 -05:00
Mike Beach
4910a3e877
Missed header include (for non-unity builds).
...
[CL 2362640 by Mike Beach in Main branch]
2014-11-17 17:35:07 -05:00
Mike Beach
c2be77a859
[UE-5068] First pass, adding command-line options to invoke the Blueprint diff tool (from the command-line... can be set up with p4v).
...
#codereview Dan.OConnor
[CL 2362428 by Mike Beach in Main branch]
2014-11-17 15:04:07 -05:00
