Dan Oconnor 4b8c2df7a3 Abusing a global, moved to member function. This triggered an assert on Linux, may also not play nice with monolithic builds that include the merge module... ...

[CL 2281945 by Dan Oconnor in Main branch]

2014-09-02 16:17:21 -04:00

..

Private

Abusing a global, moved to member function. This triggered an assert on Linux, may also not play nice with monolithic builds that include the merge module...

2014-09-02 16:17:21 -04:00

Public

#UE4 blueprintmerge no longer has buttons, binds to blueprint editor. No longer inherits from SBlueprintDiff.

2014-08-05 14:46:11 -04:00

Merge.Build.cs

#UE4 First iteration on the merge module.. Changes to diff panel reviewed by Mike Beach, driver disabled by [AssetMerge] EnableAssetMerge

2014-06-25 13:25:21 -04:00