Xenofon Foukas 0f5b01457b Merge remote-tracking branch 'oai/develop' into oai-integration ...

Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c

2016-05-17 13:18:09 +01:00

..

MAC

Merge remote-tracking branch 'oai/develop' into oai-integration

2016-05-17 13:18:09 +01:00

PDCP_v10.1.0

Merge from bugfix-48-L1L2Signalling to develop

2016-05-02 15:12:11 +02:00

RLC

Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling

2016-03-31 14:36:12 -07:00

COPYING

* Update license and header files

2014-07-22 13:43:51 +00:00

layer2_top.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

Makefile

re-adding accidentally removed Makefiles

2015-03-06 08:49:43 +00:00

Makefile.inc

sync

2015-04-20 14:17:25 +00:00

openair2_proc.c

Merge remote-tracking branch 'oai/develop' into oai-integration

2016-05-17 13:18:09 +01:00

register.c

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

register.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00