1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-17 23:34:56 +00:00
Commit Graph

7 Commits

Author SHA1 Message Date
Carles Fernandez
f7d9438801 Updating configuration files 2015-07-21 19:14:17 +02:00
Carles Fernandez
ce5783ca61 Merge branch 'cross-compile' of
https://github.com/anthony-arnold/gnss-sdr into anthony-cross-compile

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-03-20 21:14:56 +01:00
Carles Fernandez
f92b20ddcf small fix 2014-11-13 18:35:19 +01:00
Carles Fernandez
e0125c18ea Merge branch 'next' of git+ssh://github.com/carlesfernandez/gnss-sdr
into next

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-11-13 18:33:49 +01:00
Carles Fernandez
8f6859fb5e Removing personal folders names in configuration files 2014-09-08 15:54:34 +02:00
Carles Fernandez
dfd9be34a9 Merge branch 'galileo_e5a' of https://github.com/marc-sales/gnss-sdr
into next

Conflicts:
	src/core/receiver/gnss_block_factory.cc
	src/core/receiver/gnss_flowgraph.cc
2014-09-05 18:51:08 +02:00
Javier Arribas
862a0d7940 Enabling tropo correction in hybrid solution.
Updating configuration files for new satellite selection engine
2014-09-04 17:31:48 +02:00