Carles Fernandez bfbea68c8f Merge branch 'next' of git://github.com/Arribas/gnss-sdr into ... tracking_arribas # Conflicts: # src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt # src/core/receiver/gnss_block_factory.cc		2015-11-27 14:53:33 +01:00
..
adapters	Name change in new DLL PLL algorithm implementation. We introduce DLL	2015-11-27 12:53:27 +01:00
gnuradio_blocks	Merge branch 'next' of git://github.com/Arribas/gnss-sdr into	2015-11-27 14:53:33 +01:00
libs	reverting wrong change	2015-11-27 14:06:30 +01:00
CMakeLists.txt	Updating copyright year	2015-01-08 19:49:59 +01:00