1. 18 Nov, 2016 1 commit
    • Florian Kaltenberger's avatar
      Merge remote-tracking branch 'origin/develop' into feature-21-TM7 · 87690249
      Florian Kaltenberger authored
      Conflicts:
      	cmake_targets/CMakeLists.txt
      	openair1/PHY/INIT/lte_init.c
      	openair1/PHY/INIT/lte_param_init.c
      	openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
      	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
      	openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
      	openair1/PHY/LTE_TRANSPORT/dci.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
      	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
      	openair1/PHY/LTE_TRANSPORT/initial_sync.c
      	openair1/PHY/LTE_TRANSPORT/pbch.c
      	openair1/PHY/LTE_TRANSPORT/pilots.c
      	openair1/PHY/LTE_TRANSPORT/pmch.c
      	openair1/PHY/LTE_TRANSPORT/proto.h
      	openair1/PHY/defs.h
      	openair1/SCHED/phy_procedures_lte_eNb.c
      	openair1/SCHED/phy_procedures_lte_ue.c
      	openair1/SIMULATION/LTE_PHY/dlsim.c
      	openair1/SIMULATION/LTE_PHY/mbmssim.c
      	openair1/SIMULATION/LTE_PHY/pdcchsim.c
      	openair1/SIMULATION/LTE_PHY/ulsim.c
      	openair2/ENB_APP/enb_config.c
      	openair2/RRC/LITE/rrc_eNB.c
      	targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
      	targets/RT/USER/lte-softmodem.c
      	targets/RT/USER/lte-ue.c
      	targets/RT/USER/sched_rx_pdsch.c
      	targets/SIMU/USER/init_lte.c
      	targets/SIMU/USER/oaisim_functions.c
      87690249
  2. 14 Nov, 2016 2 commits
  3. 10 Nov, 2016 3 commits
  4. 08 Nov, 2016 1 commit
  5. 04 Nov, 2016 1 commit
  6. 03 Nov, 2016 5 commits
  7. 25 Oct, 2016 2 commits
  8. 21 Oct, 2016 1 commit
  9. 19 Oct, 2016 1 commit
  10. 18 Oct, 2016 2 commits
  11. 17 Oct, 2016 4 commits
  12. 13 Oct, 2016 1 commit
  13. 12 Oct, 2016 3 commits
  14. 11 Oct, 2016 7 commits
  15. 10 Oct, 2016 6 commits