ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 20:01:32 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,631 Commits 6 Branches 0 Tags 164 MiB
df357653e9
Commit Graph

32 Commits

Author SHA1 Message Date
Philip C Monk
df357653e9 send merge messages to talk 2015-04-24 16:03:23 -04:00
Philip C Monk
ca788cac3c Merge remote-tracking branch 'origin/test' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/helm/core.hook
	urb/zod/main/arvo/ford.hoon
 2015-04-23 20:46:25 -04:00
Philip C Monk
75e4b36d36 port merge tools to dojo model 2015-04-23 20:34:36 -04:00
Philip C Monk
dd0716eb72 Merge branch 'master' into typedclay 
Conflicts:
	n/t.c
	urb/urbit.pill
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
	urb/zod/main/arvo/dill.hoon
	urb/zod/main/arvo/eyre.hoon
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/arvo/gall.hoon
	urb/zod/main/arvo/hoon.hoon
	urb/zod/main/mar/json/door.hook
	urb/zod/main/mar/md/door.hook
	urb/zod/main/mar/txt/door.hook
	v/raft.c
	v/unix.c
 2015-04-22 20:18:19 -04:00
Philip C Monk
ba69927f53 new hash algorithm works 2015-04-21 16:23:50 -04:00
Philip C Monk
4934595617 waypoint 2015-04-20 19:36:19 -04:00
Philip C Monk
872bb5b1c1 cal in mate/meld 2015-04-20 16:42:18 -04:00
Philip C Monk
8de064cf1f new %meet compiles 2015-04-18 03:31:58 -04:00
Philip C Monk
af8617dc9a removed printfs 2015-04-17 19:21:54 -04:00
Philip C Monk
7ae4742d10 boots again 2015-04-16 20:22:39 -04:00
Philip C Monk
8560bae3b8 waypoint 2015-04-14 20:48:37 -04:00
Philip C Monk
2e462a3c0d waypoint 2015-04-13 20:29:54 -04:00
Philip C Monk
b62bacbf1d annotated merges seem to be working 2015-04-13 17:29:39 -04:00
Philip C Monk
9e10039dfc bug fixing 2015-04-08 20:51:34 -04:00
Philip C Monk
c7d8cfd114 mostly working userlevel conflict merge 2015-04-07 18:24:16 -04:00
Philip C Monk
939c129539 bug fixes 2015-04-06 19:20:28 -04:00
Philip C Monk
76fd6824a6 :merge rework 2015-04-03 21:31:57 -04:00
Philip C Monk
ff6a9c3198 ~doznec boots 2015-04-01 19:57:38 -04:00
Philip C Monk
ca85c9728e make subs boot again 2015-03-31 15:52:47 -04:00
Philip C Monk
21e3d981d4 historical .^ 2015-03-30 18:12:18 -04:00
Philip C Monk
c246a061ad notification-only subscription path 2015-03-26 19:26:39 -04:00
Philip C Monk
5c489935cf another round of performance improvements 2015-03-24 19:35:04 -04:00
Philip C Monk
9823077b86 waypoint 2015-03-24 17:46:32 -04:00
Anton Dyudin
cc45140ca6 Cached %bake 
Conflicts:
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/mar/react-snip/door.hook
	urb/zod/main/mar/react/door.hook
	v/raft.c
 2015-03-24 16:30:30 -04:00
Philip C Monk
a8409da5cf autosync works 2015-03-23 16:40:33 -04:00
Philip C Monk
f8928f908a network clay performance 2015-03-20 15:20:17 -04:00
Philip C Monk
fb6b5245ce validate plops with correct case 2015-03-19 15:34:25 -04:00
Philip C Monk
874c7ea21e performance improvements 2015-03-18 17:25:01 -04:00
Philip C Monk
7c8e49c54f cleanup 2015-03-13 18:52:15 -04:00
Philip C Monk
681b8e3960 subs boot 2015-03-13 17:47:29 -04:00
Philip C Monk
995d006e7a sub downloads files, but doesn't start terminal 2015-03-12 20:38:12 -04:00
Philip C Monk
f55f5bc295 moving stuff around 2015-03-11 20:37:37 -04:00