1. 01 Sep, 2016 1 commit
    • Cedric Roux's avatar
      Merge remote-tracking branch 'origin/develop' into feature-15-carrier_aggregation · 81f578f0
      Cedric Roux authored
      lte-softmodem compiles, not tested if things work...
      
      Conflicts:
      	cmake_targets/CMakeLists.txt
      	openair1/PHY/LTE_TRANSPORT/pucch.c
      	openair1/SCHED/phy_procedures_lte_eNb.c
      	openair2/LAYER2/MAC/eNB_scheduler_RA.c
      	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
      	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
      	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
      	openair2/LAYER2/MAC/main.c
      	openair2/PHY_INTERFACE/defs.h
      	openair2/RRC/LITE/rrc_eNB.c
      	targets/RT/USER/lte-softmodem.c
      81f578f0
  2. 26 Aug, 2016 2 commits
  3. 24 Aug, 2016 5 commits
  4. 23 Aug, 2016 9 commits
  5. 22 Aug, 2016 2 commits
  6. 19 Aug, 2016 2 commits
  7. 18 Aug, 2016 3 commits
  8. 17 Aug, 2016 1 commit
  9. 16 Aug, 2016 6 commits
  10. 14 Aug, 2016 9 commits