ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 12:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,644 Commits 6 Branches 0 Tags 164 MiB
e39cfecded
Commit Graph

20 Commits

Author SHA1 Message Date
Philip C Monk
f073b515f6 fixed %cy hashes and allow de-sync from unix 2015-04-28 17:36:37 -04:00
Philip C Monk
280728d1f3 sync to main-away 2015-04-28 14:20:22 -04:00
Philip C Monk
0fc29d1a38 fixed hash bug 2015-04-24 17:07:34 -04:00
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
Anton Dyudin
dab189541a fixed reload order 2015-04-16 16:41:00 -07:00
Anton Dyudin
1d9490c322 Merge remote-tracking branch 'origin/test' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-04-08 18:42:06 -07:00
Philip C Monk
56948115ef added :helm+init 2015-04-08 14:27:51 -04:00
Anton Dyudin
3c2762a9d1 :helm+sync syd her sud 2015-04-07 18:08:48 -07:00
C. Guy Yarvin
2b3a929ad2 Various fixes and improvements. 2015-04-02 11:50:31 -07:00
C. Guy Yarvin
b032d7e8cc More renaming. 2015-03-28 03:57:02 -07:00
Anton Dyudin
259311f205 Merge branch 'eyre-new' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-03-26 13:33:08 -07:00
C. Guy Yarvin
845f09beff :begin on cruiser works. 2015-03-18 15:01:47 -07:00
C. Guy Yarvin
6587a05a7e Right before pill switch from dull to dill. 2015-03-17 10:56:54 -07:00
C. Guy Yarvin
262ecf5e7b Dojo with reset and reload. 2015-03-12 09:35:06 -07:00
C. Guy Yarvin
25bbc1c67f Basic dialog workings. 2015-02-25 08:57:43 -08:00
C. Guy Yarvin
8b2dfedee2 Barnaby, almost working. 2015-02-24 14:53:31 -08:00
C. Guy Yarvin
24932f3b44 Various fixes and improvements. 2015-02-24 10:57:47 -08:00