Cameron Gutman cc37da9a56 Merge branch 'v2.5' ...

Conflicts:
	libs/limelight-common.jar

2014-07-03 16:30:10 -07:00

..

armeabi-v7a

File mode modified on libs

2014-03-16 18:23:03 -04:00

x86

File mode modified on libs

2014-03-16 18:23:03 -04:00

android-support-v4.jar

Eclipse autogenerated project files

2013-09-21 01:04:32 -04:00

bcpkix-jdk15on-150.jar

Implement crypto provider and GFE 2.1 compatibility

2014-06-15 20:17:09 -07:00

bcprov-jdk15on-150.jar

Implement crypto provider and GFE 2.1 compatibility

2014-06-15 20:17:09 -07:00

jmdns-fixed.jar

Replace dnsjava with jmdns and remove a redundant classpath entry

2014-06-29 23:50:32 -07:00

limelight-common.jar

Merge branch 'v2.5'

2014-07-03 16:30:10 -07:00

tinyrtsp.jar

Remove extra files from TinyRTSP Jar

2014-05-12 20:36:07 -05:00