Squashed commit of the following:
commit 4bbcf7cf Merge: 6433c1f7 1fb76157 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Sat Sep 2 10:38:30 2017 +0200 Merge branch 'develop' into develop-sidekiq commit 6433c1f7 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Fri Sep 1 19:47:42 2017 +0200 updates for CMakeLists.txt (for Sidekiq) and tracing in skiq_lib.c commit f395cb54 Merge: c0725ddc 17b9a9e9 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Sun Aug 20 09:08:52 2017 +0200 Merge branch 'develop' into develop-sidekiq commit c0725ddc Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Sun Aug 20 08:55:24 2017 +0200 some changes for sidekiq commit cae97783 Merge: 2253c554 d0e2938b c124e32a Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed May 3 18:00:07 2017 +0200 Merge branch 'develop', remote-tracking branch 'origin' into develop-sidekiq commit 2253c554 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Tue Mar 21 19:04:29 2017 +0100 fixes after merge with develop Y commit 7c1bbb57 Merge: fbaf8a62 bd173433 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Tue Mar 21 18:52:03 2017 +0100 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sidekiq commit fbaf8a62 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Tue Mar 21 18:37:02 2017 +0100 updates for Sidekiq commit da500691 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Sun Mar 12 10:31:57 2017 +0100 conflict resolution after merge with develop commit 63e7c171 Merge: f8ee74de 5c375d3a Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Sun Mar 12 10:22:53 2017 +0100 Merge remote-tracking branch 'origin/develop' into develop-sidekiq commit f8ee74de Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed Jan 4 13:23:14 2017 -0500 remove unused file commit 2e310b8c Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed Jan 4 13:22:23 2017 -0500 SKIQ library commit 83f00909 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed Jan 4 13:21:30 2017 -0500 modifications for sidekiq commit 18d05df0 Merge: 09831815 3bf8768d Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Fri Dec 23 11:18:15 2016 -0500 Merge remote-tracking branch 'origin/develop' into develop-sidekiq commit 09831815 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Fri Dec 23 11:08:42 2016 -0500 changes for sidekiq commit 467384bc Merge: 933e874c 9927838e Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed Oct 26 17:07:11 2016 -0400 Merge branch 'develop' into develop-sidekiq commit 933e874c Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed Oct 26 17:05:39 2016 -0400 added skeleton for Sidekiq commit 3185d596 Merge: e86ec117 82e54108 Author: Raymond Knopp <raymond.knopp@eurecom.fr> Date: Wed Oct 26 17:04:14 2016 -0400 Merge remote-tracking branch 'origin' into develop-sidekiq
Showing
Please register or sign in to comment