1. 24 Jan, 2017 5 commits
  2. 17 Oct, 2016 8 commits
  3. 13 Oct, 2016 1 commit
  4. 03 Oct, 2016 7 commits
  5. 23 Sep, 2016 7 commits
  6. 20 Sep, 2016 6 commits
  7. 15 Sep, 2016 1 commit
    • Cedric Roux's avatar
      Merge remote-tracking branch 'origin/feature-15-carrier_aggregation' into... · 33d538f3
      Cedric Roux authored
      Merge remote-tracking branch 'origin/feature-15-carrier_aggregation' into feature-31-ff-scheduler-api
      
       Conflicts:
          cmake_targets/CMakeLists.txt
          openair1/PHY/LTE_TRANSPORT/dci_tools.c
          openair1/PHY/LTE_TRANSPORT/pucch.c
          openair1/SCHED/phy_procedures_lte_eNb.c
          openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
          openair2/LAYER2/MAC/proto.h
          openair2/RRC/LITE/rrc_eNB.c
      33d538f3
  8. 14 Sep, 2016 2 commits
  9. 13 Sep, 2016 2 commits
  10. 12 Sep, 2016 1 commit