summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2012-12-17 13:35:12 (GMT)
committerTony Theodore <tonyt@logyst.com>2012-12-17 13:35:12 (GMT)
commit6124d1a06e4113b1fcd0bdfb7ce5f042aae9c779 (patch)
tree068a0220b45006c62dd9dd12b9128795c3f6aaee
parent631bb4d1ea2e708ff8692116b1736102126320fd (diff)
parent4e11b9b9b8588b4b204f72d3681bff057e7916b3 (diff)
downloadmxe-6124d1a06e4113b1fcd0bdfb7ce5f042aae9c779.zip
mxe-6124d1a06e4113b1fcd0bdfb7ce5f042aae9c779.tar.gz
mxe-6124d1a06e4113b1fcd0bdfb7ce5f042aae9c779.tar.bz2
Merge branch 'master' of github.com:mxe/mxe
-rw-r--r--index.html2
-rw-r--r--src/armadillo.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/index.html b/index.html
index 2a23520..c9a0e5f 100644
--- a/index.html
+++ b/index.html
@@ -928,7 +928,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
</tr>
<tr>
<td id="armadillo-package">armadillo</td>
- <td id="armadillo-version">3.6.0</td>
+ <td id="armadillo-version">3.6.1</td>
<td id="armadillo-website"><a href="http://armadillo.sf.net/">Armadillo C++ linear algebra library</a></td>
</tr>
<tr>
diff --git a/src/armadillo.mk b/src/armadillo.mk
index b7f2a46..10071d5 100644
--- a/src/armadillo.mk
+++ b/src/armadillo.mk
@@ -4,7 +4,7 @@
# armadillo
PKG := armadillo
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := f2a29c78d3c18a48187ef9fc15011d89b2c5268e
+$(PKG)_CHECKSUM := c3b34f2c240ca1da6e9e3728dc1ebd2d197a2071
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)