Matthew Griffin bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update ...

#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]

2016-01-07 08:17:16 -05:00

..

JavaLibs

Code documentation from CL#2636592

2015-07-29 07:47:34 -04:00

JavaTemplates

Add launch image support for Android (disabled for GearVR)

2015-08-28 19:34:42 -04:00

jni

- Initial "Fat" binary support for Android - multiple architectures at once, by compiling multiple .so's in one go of UBT (will be controlled by Project Settings, intentionally hidden for now)

2014-08-26 09:56:29 -04:00

libs

Updating TPS files

2015-09-04 20:53:02 -04:00

res

Merging using UE4-To-UE4-Releases-4.10

2015-10-02 15:29:14 -04:00

src/com

Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update

2016-01-07 08:17:16 -05:00

custom_rules.xml

Fix older Android SDK zipalign path for Ant and an issue for mac (.bat was hardcoded)

2015-06-22 12:52:23 -04:00

proguard-project.txt

Copying //UE4/Dev-Platform to //UE4/Main

2015-12-10 16:56:55 -05:00