Raymond Knopp 1d3ce6d99c Merge branch 'cleanup' into bugfix-48-L1L2signaling ...

Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/COMMON/common_lib.c

2016-03-27 03:09:22 -07:00

..

common_lib.c

Merge branch 'cleanup' into bugfix-48-L1L2signaling

2016-03-27 03:09:22 -07:00

common_lib.h

Merge branch 'enhancement-74-SoDeRa' into develop

2016-02-17 16:50:16 +01:00

COPYING

adding/updating license to GPL3

2014-08-14 11:39:48 +00:00