Merge remote-tracking branch 'origin/develop' into x2

Browse Source

Conflicts:
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_defs.h

...

This commit is contained in:

Cedric Roux

2019-02-13 15:20:45 +01:00

parent 932f6017fa 5275479751

commit 1c6b9f0eda

212 changed files with 15222 additions and 5547 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

common/utils/collection/queue.h

Executable → Regular

common/utils/collection/tree.h

Executable → Regular