Joe Conley
|
c12a880a0c
|
Unshelved from pending changelist '4791207':
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5
#rb Ryan.Vance
[CL 4792243 by Joe Conley in Dev-VR branch]
|
2019-01-23 19:56:41 -05:00 |
|
Ryan Vance
|
7c51ff94af
|
Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration
[CL 4748712 by Ryan Vance in Dev-VR branch]
|
2019-01-17 18:54:05 -05:00 |
|
Jason Bestimt
|
5a32e7c996
|
#DEV-VR - Merge MAIN @ CL 4091964
#RB:none
[CL 4094029 by Jason Bestimt in Dev-VR branch]
|
2018-05-25 10:20:11 -04:00 |
|
Jason Bestimt
|
ef10cc63a1
|
Merge to Dev-VR @ 4091081
#rb
#rnx
#CodeReview: mike.beach, nick.whiting, charles.egenbacher
[CL 4093759 by Jason Bestimt in Dev-VR branch]
|
2018-05-25 08:52:49 -04:00 |
|
Marc Audy
|
857044bd3b
|
Fix non-unity compile errors
#rb
#rnx
#lockdown Nick.Penwarden
[CL 4091964 by Marc Audy in Main branch]
|
2018-05-24 11:34:20 -04:00 |
|
Marc Audy
|
d90da4ab1a
|
Merge to Dev-Main for 4.20 @ 4090813
#rb
#rnx
#lockdown Nick.Penwarden
[CL 4091081 by Marc Audy in Main branch]
|
2018-05-23 21:04:31 -04:00 |
|
Ben Marsh
|
13d012685f
|
Merging copyright update from 4.19 branch.
#rb none
#rnx
#jira
[CL 3818977 by Ben Marsh in Staging-4.19 branch]
|
2018-01-02 15:30:26 -05:00 |
|
Arciel Rekman
|
19116aa1a5
|
Fix crash reporter missing in Linux builds.
#rb Ben.Marsh (discussed)
#fyi Ben.Marsh, Matt.Kuhlenschmidt
#lockdown Nick.Penwarden
[CL 3622648 by Arciel Rekman in Main branch]
|
2017-09-01 12:46:25 -04:00 |
|