diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-12-13 13:50:44 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-12-13 13:50:47 +0200 |
| commit | 04294d5856c87f1f20d09274565201d824d5a8c8 (patch) | |
| tree | 32fe9d3fbe90273724c22f80609b7edd156a3f01 | |
| parent | onwards to 0.8.8.7 (diff) | |
| parent | Merge branch 'master' of https://github.com/fluffypony/bitmonero (diff) | |
| download | monero-04294d5856c87f1f20d09274565201d824d5a8c8.tar.xz | |
Merge pull request #205
b261448 revert the removal of the 'arch' flag from the release-static target (Riccardo Spagni)
a956f07 added gpg key for warptangent (Riccardo Spagni)
ac19084 revert the removal of the 'arch' flag from the release-static target (Riccardo Spagni)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | utils/gpg_keys/warptangent.asc | 52 |
2 files changed, 53 insertions, 1 deletions
@@ -32,7 +32,7 @@ all-release: release-static: mkdir -p build/release - cd build/release && cmake -D STATIC=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) + cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) clean: @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ diff --git a/utils/gpg_keys/warptangent.asc b/utils/gpg_keys/warptangent.asc new file mode 100644 index 000000000..cacd787b6 --- /dev/null +++ b/utils/gpg_keys/warptangent.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +vL0= +=lURU +-----END PGP PUBLIC KEY BLOCK----- |