shrub/pkg/base-dev/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 various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
bip39 various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
language-server various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
ph Merge branch 'hm/btc-wallet-conflict-resolution' into ea/master-dist-deconflict 2021-09-27 18:55:45 -05:00
agentio.hoon base-dev: update lib/agentio 2021-09-06 14:30:47 +10:00
azimuth.hoon Merge branch 'master' into next/arvo 2021-12-10 08:24:32 +00:00
azimuthio.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
bip32.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
bip39.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
bitcoin-utils.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
cram.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
dbug.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
default-agent.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
der.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
ethereum.hoon Merge branch 'master' into naive/roller 2021-10-26 20:46:32 +02:00
ethio.hoon Merge branch 'master' into naive/roller 2021-10-26 20:46:32 +02:00
jose.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
keygen.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
pill.hoon pill: do not include /tests in file-ovum 2021-09-29 22:12:20 +04:00
pkcs.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
primitive-rsa.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
ring.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
server.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
shoe.hoon Merge branch 'next/arvo' into m/shoe-scry 2021-12-08 13:13:54 +01:00
skeleton.hoon base-dev: update missing libs 2021-08-11 14:15:40 +10:00
sole.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00
strand.hoon spider, docket: fix versioning and validate-mark 2021-10-05 22:46:07 -04:00
strandio.hoon strandio: stop crashing on 504 2021-09-29 15:45:59 +10:00
test.hoon various: fix dependencies & tests 2021-09-17 14:51:19 +10:00
verb.hoon various: fixes, pill might actually work now 2021-08-10 16:13:27 +03:00