Skip to content
Snippets Groups Projects
  1. Sep 01, 2016
    • Cédric Roux's avatar
      Merge remote-tracking branch 'origin/develop' into feature-15-carrier_aggregation · 81f578f0
      Cédric 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. Aug 26, 2016
  3. Aug 24, 2016
  4. Aug 23, 2016
  5. Aug 22, 2016
  6. Aug 19, 2016
  7. Aug 18, 2016
  8. Aug 17, 2016
  9. Aug 16, 2016
  10. Aug 14, 2016
Loading