diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-23 08:03:40 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-23 08:03:40 -0500 |
| commit | 4cc838f1ff42b438b816eab3c4dbbbea7fa9a18a (patch) | |
| tree | 5dc35345323b8c59f6ed641da2e6cc77185d41dc | |
| parent | 6d73fba14cce3e907683a5258e1b1ce74e10af93 (diff) | |
| parent | 84824814783239f652de92c4b79db628477eeb7e (diff) | |
| download | monzero-gui-4cc838f1ff42b438b816eab3c4dbbbea7fa9a18a.tar.gz monzero-gui-4cc838f1ff42b438b816eab3c4dbbbea7fa9a18a.tar.xz monzero-gui-4cc838f1ff42b438b816eab3c4dbbbea7fa9a18a.zip | |
Merge pull request #424
8482481 pin submodule to monero head (Jaquee)
61f4db6 Update submodule + fix epee link (Jaquee)
| -rwxr-xr-x | get_libwallet_api.sh | 2 | ||||
| m--------- | monero | 0 | ||||
| -rw-r--r-- | monero-wallet-gui.pro | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 9d52b911..d66c4c8f 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -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 diff --git a/monero b/monero -Subproject 16b8b66adcad57983b099fdf3ac1b52519390bc +Subproject daf66621dcf43f36067465a1f1c99f5b1390c40 diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index dab04749..e6a9a675 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -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 |