shrub/pkg/arvo/lib
Jōshin d94aa5704b
Merge branch 'master' into next/arvo
Conflicts:
	pkg/arvo/lib/azimuth.hoon

This file was turned into a symlink to pkg/base-dev/lib/azimuth.hoon on
one side of the fork, and meanwhile edited on the other side of the fork
(to update ecliptic to the new address for the WSTR fix.)

The two sides of the fork both had different outdated addresses in
base-dev's azimuth.hoon file, and Git's UI helpfully refilled the
contents of arvo's azimuth.hoon so that it showed a merge conflict with
an empty diff.

Resolved by reading out HEAD:pkg/arvo/lib/azimuth.hoon into
pkg/base-dev/lib/azimuth.hoon and manually recreating the symlink.
2021-12-10 08:24:32 +00:00
..
bip %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
bip39 %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
hood Merge pull request #5426 from ynx0/claybel 2021-11-15 08:49:31 -08:00
json azimuth: send updates to jael 2021-11-08 21:56:47 -08:00
language-server %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
ph ./symbolic-merge.sh base-dev arvo 2021-09-27 21:02:18 -04:00
agentio.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
aqua-azimuth.hoon aqua: cleanup api, fix scry handling 2021-06-18 15:53:24 +10:00
aqua-vane-thread.hoon aqua: make faster so moon-az can finish 2019-12-03 23:53:42 -08:00
azimuth-roll-rpc.hoon roller-rpc: fix typo 2021-11-15 05:44:52 +01:00
azimuth.hoon azimuth: update ecliptic address 2021-12-02 21:45:39 +01:00
azimuthio.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
bip32.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
bip39.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
bitcoin-utils.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
claz.hoon claz: add upgrade poll support 2021-11-25 11:56:42 +01:00
cram.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
csv.hoon custody: add more types 2019-10-21 15:41:28 -07:00
dbug.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
default-agent.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
der.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
desk-jam.hoon desk-jam: exclude /tests from desk jams 2021-09-29 22:59:19 +04:00
dice.hoon dice: remove extra p 2021-11-11 06:36:27 +01:00
dns.hoon dns: reduce to simpler threads 2019-11-25 21:54:46 -08:00
ethereum.hoon ethereum: add block to %eth-get-balance 2021-09-20 07:19:05 +02:00
ethio.hoon ethereum: add block to %eth-get-balance 2021-09-20 07:19:05 +02:00
generators.hoon various: touch up improperly rewritten comments 2020-11-27 13:25:40 +01:00
jose.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
keygen.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
naive-transactions.hoon naive-transactions: remove unused arm 2021-11-10 08:29:37 +01:00
naive.hoon naive: remove unused arms 2021-10-05 23:58:59 -05:00
number-to-words.hoon Add 'pkg/arvo/' from commit 'c20e2a185f131ff3f5d3961829bd7a3fe0f227f8' 2019-06-28 12:48:05 +08:00
old-phon.hoon hoon: renames +new-end, +new-lsh, +new-rsh 2020-12-02 01:00:09 -08:00
pill.hoon ./symbolic-merge.sh base-dev arvo 2021-09-27 21:02:18 -04:00
pkcs.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
plume.hoon hoon: moves $plum and +plume to userspace 2020-11-20 15:23:56 -08:00
pprint.hoon Merge branch 'm/remove-ketcen' into m/modern-hoon 2020-11-30 20:08:17 -08:00
pretty-file.hoon various: move away from {type} syntax 2020-11-26 17:43:26 +01:00
primitive-rsa.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
rekey.hoon Add 'pkg/arvo/' from commit 'c20e2a185f131ff3f5d3961829bd7a3fe0f227f8' 2019-06-28 12:48:05 +08:00
ring.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
server.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
shoe.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
show-dir.hoon various: move away from {type} syntax 2020-11-26 17:43:26 +01:00
skeleton.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
sole.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
strand.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
strandio.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
test.hoon various: update symbolic merges 2021-09-17 14:54:01 +10:00
time-to-id.hoon various: move away from face/type syntax 2020-11-26 17:38:00 +01:00
tiny.hoon naive: remove unused arms 2021-10-05 23:58:59 -05:00
trie.hoon spider: add process tree 2019-11-09 23:27:07 -08:00
verb.hoon %base: symlinks; some -test tests fail 2021-08-30 20:39:37 +03:00
vere.hoon ivory: update preboot validation format 2021-11-08 20:34:32 -08:00
xray.hoon various: move away from {type} syntax 2020-11-26 17:43:26 +01:00