Javier Arribas 46752fcc7c Merge branch 'next' into Arribas_branch/next ...

Conflicts:
	src/algorithms/signal_source/adapters/uhd_signal_source.cc
	src/core/receiver/gnss_flowgraph.cc

2015-03-01 21:33:20 +01:00

..

algorithms

Merge branch 'next' into Arribas_branch/next

2015-03-01 21:33:20 +01:00

core

Merge branch 'next' into Arribas_branch/next

2015-03-01 21:33:20 +01:00

main

empty folders forbidden by debian packaging

2015-02-15 15:50:31 +01:00

tests

Fixing test

2015-02-27 15:58:07 +01:00

utils

fixing includes

2015-01-09 13:47:52 +01:00

CMakeLists.txt

Updating copyright year

2015-01-08 19:49:59 +01:00