Carles Fernandez 23ce240483 Merge branch 'carrier_phase_bug_fix' of ... git+ssh://github.com/gnss-sdr/gnss-sdr into odrisci-contrib # Conflicts: # conf/gnss-sdr_Hybrid_byte_sim.conf # src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc # src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc # src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc # src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc # src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc # src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc # src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc # src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc # src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc # src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc # src/algorithms/tracking/libs/cpu_multicorrelator.cc # src/algorithms/tracking/libs/cpu_multicorrelator.h # src/algorithms/tracking/libs/cuda_multicorrelator.h # src/algorithms/tracking/libs/tracking_discriminators.cc # src/core/receiver/gnss_block_factory.cc # src/core/system_parameters/GPS_L1_CA.h		2015-11-30 13:59:31 +01:00
..
adapters	Added missing files	2015-06-06 00:36:47 +02:00
gnuradio_blocks	Merge branch 'carrier_phase_bug_fix' of	2015-11-30 13:59:31 +01:00
CMakeLists.txt	Updating copyright year	2015-01-08 19:49:59 +01:00