Florian Kaltenberger b502b5060e Merge remote-tracking branch 'origin/develop' into enhancement-64-phy_test ...

Conflicts:
	targets/ARCH/EXMIMO/USERSPACE/OCTAVE/txsig.m
	targets/RT/USER/lte-ue.c

2016-10-19 21:04:00 +02:00

..

LIB

Merge branch 'develop' into feature-131-new-license

2016-10-07 13:58:08 +02:00

OAI_FW_INIT

remove COPYING files

2016-09-28 10:45:02 +02:00

OCTAVE

Merge remote-tracking branch 'origin/develop' into enhancement-64-phy_test

2016-10-19 21:04:00 +02:00