1. 05 Jan, 2019 1 commit
    • Raymond Knopp's avatar
      Merge remote-tracking branch 'origin/develop' into enhancement-ltem · 44a225c6
      Raymond Knopp authored
      Conflicts:
      	openair1/PHY/LTE_TRANSPORT/dci_tools.c
      	openair1/SCHED/fapi_l1.c
      	openair1/SCHED/phy_procedures_lte_eNb.c
      	openair2/COMMON/rrc_messages_types.h
      	openair2/ENB_APP/enb_config.c
      	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
      	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
      	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
      	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
      	openair2/LAYER2/MAC/mac.h
      	openair2/RRC/LTE/L2_interface.c
      	openair2/RRC/LTE/MESSAGES/asn1_msg.c
      	openair2/RRC/LTE/MESSAGES/asn1_msg.h
      	openair2/RRC/LTE/rrc_eNB.c
      	openair2/RRC/LTE/rrc_eNB_S1AP.c
      	targets/RT/USER/lte-enb.c
      44a225c6
  2. 04 Jan, 2019 2 commits
  3. 20 Dec, 2018 3 commits
  4. 19 Dec, 2018 3 commits
  5. 18 Dec, 2018 7 commits
  6. 14 Dec, 2018 1 commit
  7. 13 Dec, 2018 5 commits
  8. 12 Dec, 2018 2 commits
  9. 10 Dec, 2018 1 commit
  10. 05 Dec, 2018 1 commit
  11. 04 Dec, 2018 2 commits
  12. 03 Dec, 2018 5 commits
  13. 30 Nov, 2018 2 commits
    • Wang Tsu-Han's avatar
      Merge branch 'develop' into L1_renaming · 1c025c2d
      Wang Tsu-Han authored
      Conflicts:
      	common/utils/LOG/log.c
      	targets/RT/USER/lte-enb.c
      	targets/RT/USER/lte-softmodem.c
      1c025c2d
    • Raphael Defosseux's avatar
      Merge branch 'develop_integration_w48' into 'develop' · fb5739dc
      Raphael Defosseux authored
      Develop integration 2018 week 48
      
      See merge request oai/openairinterface5g!462
      
      Integration of the following MRs:
      
       - MR 448: Missing RRC inactivity timer
       - MR 458: Adding MAC main config to RRC connection setup
       - MR 457: Resolving "parallelization not working correctly in phy simulators"
       - MR 460: Fixing RU DFT initialization
      fb5739dc
  14. 29 Nov, 2018 3 commits
  15. 28 Nov, 2018 2 commits