urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-18 15:55:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
905 Commits 768 Branches 10 Tags 215 MiB
c0326a0c06
Commit Graph

905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
johncburnham
9c027f2c7b Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 19:17:58 -07:00
Ubuntu
c0e41c19e9 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-06 00:54:39 +00:00
C. Guy Yarvin
58e4537069 Merge branch 'master' of github.com:urbit/urbit 2014-08-05 17:19:28 -07:00
John Dulin
de782e3980 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 16:50:08 -07:00
C. Guy Yarvin
518927c817 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 15:33:52 -07:00
ault011
1e51f2b554 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:04:56 -07:00
johncburnham
6c0a7c94d7 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:03:16 -07:00
ault011
9845404373 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:02:49 -07:00
C. Guy Yarvin
604d3f1c13 Merge branch 'master' of github.com:urbit/urbit 2014-08-05 14:01:02 -07:00
ault011
a204d1dfa0 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 14:00:58 -07:00
C. Guy Yarvin
315b571959 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 12:50:16 -07:00
John Dulin
55f0661277 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 12:15:15 -07:00
Anton Dyudin
f1a89d4075 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-05 11:49:52 -07:00
Jared Hance
f3d6637fda Only compare head hash 2014-08-05 10:47:58 -04:00
Jared Hance
2e2ce87449 Fix hashes in ++azel 2014-08-05 10:10:15 -04:00
C. Guy Yarvin
e7b54fe942 Moar printf. 2014-08-04 18:39:07 -07:00
C. Guy Yarvin
37aec7440a Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-04 18:20:00 -07:00
C. Guy Yarvin
929328628a Ames protocol to 3. 2014-08-04 18:19:15 -07:00
Anton Dyudin
896c5903a3 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 17:59:13 -07:00
C. Guy Yarvin
d341ec529f Ignore hashes while comparing file updates. 2014-08-04 17:38:38 -07:00
Ubuntu
10ea0cbe87 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 21:52:40 +00:00
Anton Dyudin
e23fdd54c6 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 14:05:53 -07:00
Galen Wolfe-Pauly
1b8eb395d5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 13:22:08 -07:00
Galen Wolfe-Pauly
84c793149a Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:50:37 -07:00
Galen Wolfe-Pauly
0d92e753d5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:38:02 -07:00
ault011
9b6b5d5c1e Merge branch 'master' of https://github.com/urbit/urbit 2014-08-04 12:05:40 -07:00
Galen Wolfe-Pauly
f9fa38180a Merge branch 'urbjs' 2014-08-03 12:04:55 -07:00
Galen Wolfe-Pauly
18b3b48c07 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-03 12:04:19 -07:00
C. Guy Yarvin
a4445a1a93 Merge branch 'master' of github.com:urbit/urbit 2014-08-02 16:40:49 -07:00
pcmonk
6222f8fd1f Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:53:42 -07:00
pcmonk
21780ebe27 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:46:00 -07:00
pcmonk
e25214fd5a Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:27:44 -07:00
Jared Hance
e5711ca255 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
 2014-08-01 14:02:51 -04:00
Jared Hance
05fc5f57b8 Various fixes, including timers 2014-08-01 10:54:31 -04:00
Galen Wolfe-Pauly
0269db25c3 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 16:26:47 -07:00
C. Guy Yarvin
1829cb7b87 Merge branch 'turbomem' 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:38:05 -07:00
C. Guy Yarvin
6ccb227b12 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:25:06 -07:00
C. Guy Yarvin
5c3223ba1f More memory pls. 2014-07-31 13:23:02 -07:00
C. Guy Yarvin
d5396d7aa7 Clean up some markdown stuff. 2014-07-30 21:28:48 -07:00
Jared Hance
3d8419493d Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-30 15:14:38 -04:00
pcmonk
3c57663b02 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-30 11:12:30 -07:00
C. Guy Yarvin
9cf8cff6ff Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/zod/main/pro/down/core.hoon
 2014-07-30 10:53:58 -07:00
C. Guy Yarvin
64be83c562 Various fixes and improvements. 2014-07-30 10:53:30 -07:00
pcmonk
ea79c59be2 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
 2014-07-29 17:39:49 -07:00
Jared Hance
201a115f04 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-29 13:25:18 -04:00
pcmonk
12ad8e5ff0 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-28 10:56:39 -07:00
C. Guy Yarvin
17476dd154 Merge branch 'master' of github.com:urbit/urbit 2014-07-27 12:18:22 -07:00
pcmonk
4e14219db6 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-25 19:34:51 -07:00
Galen Wolfe-Pauly
7667ebba60 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-25 12:11:06 -07:00
cgyarvin
ac9d397cf9 Merge pull request #145 from yebyen/i386 
I386/any architecture support
 2014-07-25 12:02:15 -07:00