From 772c7e8f2f9091f54981dbab66af258e44dd19b5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 26 Feb 2017 00:12:46 +0100
Subject: [PATCH] Update Armadillo to 7.800.1

Improve reference info
---
 CMakeLists.txt |  4 ++--
 README.md      | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fea14e0a..dbbd45f03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -887,8 +887,8 @@ if(NOT ARMADILLO_FOUND OR ENABLE_OWN_ARMADILLO)
          set(armadillo_MD5 "8116185e1d7391eed3bf6c500f81b4d8")
          set(ARMA_FILE_EXTENSION "gz")
      else(CMAKE_VERSION VERSION_LESS 3.1)
-         set(armadillo_RELEASE 7.600.2)
-         set(armadillo_MD5 "8dee8bc37f7cb29323c20c4104126b5c")
+         set(armadillo_RELEASE 7.800.1)
+         set(armadillo_MD5 "e094351771c40a6e06e1a9c1ffdfc2b8")
          set(ARMA_FILE_EXTENSION "xz")
      endif(CMAKE_VERSION VERSION_LESS 3.1)
 
diff --git a/README.md b/README.md
index 3d7c7104d..e6f89f6b4 100644
--- a/README.md
+++ b/README.md
@@ -129,9 +129,9 @@ or manually as explained below, and then please follow instructions on how to [d
 $ sudo apt-get install libopenblas-dev liblapack-dev   # For Debian/Ubuntu/LinuxMint
 $ sudo yum install lapack-devel blas-devel             # For Fedora/CentOS/RHEL
 $ sudo zypper install lapack-devel blas-devel          # For OpenSUSE
-$ wget http://sourceforge.net/projects/arma/files/armadillo-7.600.2.tar.xz
-$ tar xvfz armadillo-7.600.2.tar.xz
-$ cd armadillo-7.600.2
+$ wget http://sourceforge.net/projects/arma/files/armadillo-7.800.1.tar.xz
+$ tar xvfz armadillo-7.800.1.tar.xz
+$ cd armadillo-7.800.1
 $ cmake .
 $ make
 $ sudo make install
@@ -1288,7 +1288,7 @@ Publications and Credits
 
 If you use GNSS-SDR to produce a research paper or Thesis, we would appreciate if you reference the following article to credit the GNSS-SDR project:
 
- * C. Fern&aacute;ndez-Prades, J. Arribas, P. Closas, C. Avil&eacute;s, and L. Esteve, [GNSS-SDR: an open source tool for researchers and developers](http://www.cttc.es/publication/gnss-sdr-an-open-source-tool-for-researchers-and-developers/), in Proc. of the ION GNSS 2011 Conference, Portland, Oregon, Sept. 19-23, 2011.
+ * C. Fern&aacute;ndez-Prades, J. Arribas, P. Closas, C. Avil&eacute;s, and L. Esteve, [GNSS-SDR: an open source tool for researchers and developers](http://www.cttc.es/publication/gnss-sdr-an-open-source-tool-for-researchers-and-developers/), in Proc. of the 24th International Technical Meeting of The Satellite Division of the Institute of Navigation (ION GNSS), Portland, Oregon, Sept. 19-23, 2011, pp. 780-794.
 
 For LaTeX users, this is the BibTeX entry for your convenience:
 
@@ -1296,8 +1296,9 @@ For LaTeX users, this is the BibTeX entry for your convenience:
 @INPROCEEDINGS{GNSS-SDR11,
  AUTHOR = {C.~{Fern\'{a}ndez--Prades} and J.~Arribas and P.~Closas and C.~Avil\'{e}s and L.~Esteve},
  TITLE = {{GNSS-SDR}: An Open Source Tool For Researchers and Developers},
- BOOKTITLE = {Proc. of the ION GNSS 2011 Conference},
+ BOOKTITLE = {Proc. 24th Int. Tech. Meeting Sat. Div. Inst. Navig.},
  YEAR = {2011},
+ pages = {780--794},
  address = {Portland, Oregon},
  month = {Sept.} }
 ~~~~~~