Merge pull request #424

8482481 pin submodule to monero head (Jaquee)
61f4db6 Update submodule + fix epee link (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-01-23 08:03:40 -05:00
commit 4cc838f1ff
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 3 additions and 3 deletions

View file

@ -15,7 +15,7 @@ BUILD_LIBWALLET=false
if [ ! -d $MONERO_DIR/src ]; then
git submodule init monero
fi
git submodule update
git submodule update --remote
# get monero core tag
get_tag

2
monero

@ -1 +1 @@
Subproject commit 16b8b66adcad57983b099fdf3ac1b52519390bc6
Subproject commit daf66621dcf43f36067465a1f1c99f5b1390c400

View file

@ -73,7 +73,7 @@ SOURCES = *.qml \
LIBS += -L$$WALLET_ROOT/lib \
-lwallet_merged \
monero/build/release/contrib/epee/src/libepee.a \
$$WALLET_ROOT/build/release/contrib/epee/src/libepee.a \
-lunbound