Commit Graph

16 Commits

Author SHA1 Message Date
Anton Dyudin
4e12caea2d move ->lens-json conversion to mar/sole-effect,
lens ack logic inside ++ix
2016-03-31 14:23:23 -07:00
Anton Dyudin
e874ce237a verified mark code 2016-02-17 15:00:12 -08:00
Raymond Pasco
309805f5e7 Merge in Hoon 151
Complicated merge of Hoon 151. This commit is a major sequence point.
2016-02-10 14:03:28 -05:00
Anton Dyudin
c05e96c62f fix hoon location header information 2016-02-04 19:05:37 -08:00
C. Guy Yarvin
e987337bfb In the middle of internal merge. 2016-01-29 18:25:52 -08:00
C. Guy Yarvin
a0a2cdf64f Revert "Cleanup commit #1; revert this when ready to merge."
This reverts commit c12823babc63665e30fe4e3935ccda80601d6cf8.
2016-01-25 16:49:09 -08:00
C. Guy Yarvin
f6d54ae941 Cleanup commit #1; revert this when ready to merge. 2015-12-22 21:04:35 -08:00
C. Guy Yarvin
9fa3e1c23f Final conversion of # to +. 2015-12-20 13:16:39 -08:00
C. Guy Yarvin
860dff2d26 Convert + to / in codebase. 2015-12-20 12:50:45 -08:00
C. Guy Yarvin
2519413c4f Switch / to # for + to /. 2015-12-20 03:48:17 -08:00
C. Guy Yarvin
53b1351836 Mostly detoxified rogue %ktts. 2015-12-12 18:51:23 -08:00
C. Guy Yarvin
2b4e85c976 Self-booting with old syntax illegal. 2015-12-10 01:17:19 -08:00
Anton Dyudin
d53508e230 moved sole-back to sole-action %clr 2015-10-07 11:59:01 -07:00
Anton Dyudin
72bab16cf0 marked sole-back 2015-10-07 11:28:15 -07:00
Anton Dyudin
ac98cf1075 Sur disqualification moved to userspace
sed -i'' -e '/^|/{x;/./{p;s/.*//;};x;};/ *\\/-.*\\*/{h;s/ //g;s/,[a-z]*//g;s/^[^a-z]*/[/;s/ *::.*$//;s/$/ .]/;s/*/ /g;x;s/\\*//g;}' urb/zod/**.{hoon,hook}
  Followed by manual fixes where e.g. the file didn't start with a core
2015-09-01 14:02:19 -07:00
Philip C Monk
c9539452e2 Merge remote-tracking branch 'origin/newunix'
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/bit-accounts.hoon
	urb/zod/base/mar/bit-addr-made.hoon
	urb/zod/base/mar/bit-addr-request.hoon
	urb/zod/base/mar/bit-api-call.hoon
	urb/zod/base/mar/bit-get-token.hoon
	urb/zod/base/mar/bit-transaction.hoon
	urb/zod/base/mar/bit/accounts.hoon
	urb/zod/base/mar/bit/addr-made.hoon
	urb/zod/base/mar/bit/addr-request.hoon
	urb/zod/base/mar/bit/api-call.hoon
	urb/zod/base/mar/bit/get-token.hoon
	urb/zod/base/mar/bit/transaction.hoon
	urb/zod/base/mar/cloud-auth.hoon
	urb/zod/base/mar/cloud-secret.hoon
	urb/zod/base/mar/cloud/auth.hoon
	urb/zod/base/mar/cloud/secret.hoon
	urb/zod/base/mar/dill-belt.hoon
	urb/zod/base/mar/dill-blit.hoon
	urb/zod/base/mar/dill/belt.hoon
	urb/zod/base/mar/dill/blit.hoon
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/mar/oct3-update.hoon
	urb/zod/base/mar/oct3/move.hoon
	urb/zod/base/mar/oct3/update.hoon
	urb/zod/base/mar/oct4-move.hoon
	urb/zod/base/mar/oct4-update.hoon
	urb/zod/base/mar/oct4/move.hoon
	urb/zod/base/mar/oct4/update.hoon
	urb/zod/base/mar/sole-action.hoon
	urb/zod/base/mar/sole-effect.hoon
	urb/zod/base/mar/sole/action.hoon
	urb/zod/base/mar/sole/effect.hoon
	urb/zod/base/mar/talk-command.hoon
	urb/zod/base/mar/talk-report.hoon
	urb/zod/base/mar/talk/command.hoon
	urb/zod/base/mar/talk/report.hoon
	urb/zod/mar/bit-accounts.hoon
	urb/zod/mar/bit-addr-made.hoon
	urb/zod/mar/bit-addr-request.hoon
	urb/zod/mar/bit-api-call.hoon
	urb/zod/mar/bit-get-token.hoon
	urb/zod/mar/bit-transaction.hoon
	urb/zod/mar/cloud-auth.hoon
	urb/zod/mar/cloud-auth/door.hook
	urb/zod/mar/cloud-secret.hoon
	urb/zod/mar/cloud-secret/door.hook
	urb/zod/mar/dill-belt.hoon
	urb/zod/mar/dill-blit.hoon
	urb/zod/mar/oct3-move.hoon
	urb/zod/mar/oct3-update.hoon
	urb/zod/mar/oct4-move.hoon
	urb/zod/mar/oct4-update.hoon
	urb/zod/mar/sole-action.hoon
	urb/zod/mar/sole-effect.hoon
	urb/zod/mar/talk-command.hoon
	urb/zod/mar/talk-report.hoon
2015-06-23 19:28:46 -04:00