1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-30 07:50:51 +00:00
gnss-sdr/src/core/receiver
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
..
CMakeLists.txt Try to use OpenSSL if GnuTLS with openssl compatibility enabled is not 2015-10-27 20:18:48 +01:00
concurrent_map.h fixing unreachable code 2015-05-12 23:45:56 +02:00
concurrent_queue.h Update copyright year 2015-01-12 20:31:04 +01:00
control_message_factory.cc Updating copyright year 2015-01-08 19:49:59 +01:00
control_message_factory.h Updating copyright year 2015-01-08 19:49:59 +01:00
control_message.h Update copyright year 2015-01-12 21:12:08 +01:00
control_thread.cc avoid reading garbage 2015-05-24 20:41:30 +02:00
control_thread.h Destructor was not virtual 2015-01-12 21:05:38 +01:00
file_configuration.cc Updating copyright year 2015-01-08 19:49:59 +01:00
file_configuration.h Updating copyright year 2015-01-08 19:49:59 +01:00
gnss_block_factory.cc Carrier phase observable bug fix for GPS L1 CA trackings, new GPS L1 carrier aided tracking using nex multitap correlator library, and some CUDA multitap correlator performance improvements 2015-11-30 11:43:37 +01:00
gnss_block_factory.h Bug fixes 2015-05-10 12:35:49 +02:00
gnss_flowgraph.cc Merge branch 'contrib' of https://github.com/odrisci/gnss-sdr into 2015-11-30 10:18:09 +01:00
gnss_flowgraph.h Code cleaning 2015-02-27 18:21:25 +01:00
in_memory_configuration.cc Updating copyright year 2015-01-08 19:49:59 +01:00
in_memory_configuration.h Updating copyright year 2015-01-08 19:49:59 +01:00