urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 11:24:21 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,206 Commits 768 Branches 10 Tags 215 MiB
3453a8ba5c
Commit Graph

1206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
a04b915cd7 Prints. 2014-09-12 13:18:03 -07:00
C. Guy Yarvin
e1559ec244 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-12 12:55:28 -07:00
ault011
03dfaaadb8 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-12 11:43:19 -07:00
ault011
c20a95c201 Merge branch 'master' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-12 11:40:22 -07:00
C. Guy Yarvin
5541af3724 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-12 11:33:36 -07:00
C. Guy Yarvin
9f7b1f0c08 Stashing. 2014-09-12 11:32:11 -07:00
C. Guy Yarvin
67da011524 Slightly less crashy. 2014-09-11 17:41:26 -07:00
C. Guy Yarvin
5c4e9fc54e Remove old F subsystem. 2014-09-11 14:01:22 -07:00
Ubuntu
96c8b9daca Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-11 18:52:39 +00:00
Galen Wolfe-Pauly
e0c29bd8ec Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-11 11:01:22 -07:00
C. Guy Yarvin
fa6173f4d2 Ready to test. 2014-09-11 05:34:00 -07:00
C. Guy Yarvin
a71a657680 compiles and links. 2014-09-10 17:01:32 -07:00
Anton Dyudin
502abc8667 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-10 13:03:06 -07:00
Ubuntu
2289431b70 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-10 18:46:31 +00:00
C. Guy Yarvin
57278a5a1d More renaming. 2014-09-10 09:45:39 -07:00
Philip Monk
e492ebd706 Merge pull request #152 from amosjyng/patch-1 
Added g++ dependency
 2014-09-10 09:41:18 -07:00
C. Guy Yarvin
464f545e99 Merge branch 'test' into memorable 
Conflicts:
	Makefile
	gen164/watt.c
 2014-09-10 09:06:30 -07:00
Amos Ng
26bf9d4567 Added g++ dependency 2014-09-10 03:33:05 -04:00
Ubuntu
2b10d507d1 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-10 00:31:52 +00:00
Anton Dyudin
c490d7ad9c Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 14:33:51 -07:00
Anton Dyudin
ed74dee284 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 12:51:56 -07:00
Ubuntu
24583dcca5 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 18:53:36 +00:00
C. Guy Yarvin
d9ddc38de2 About to merge in test. 2014-09-09 09:44:08 -07:00
C. Guy Yarvin
ad871a1639 q but not w. 2014-09-08 21:42:55 -07:00
C. Guy Yarvin
df6bbc8fc4 Compatible with k.164. 2014-09-08 19:35:25 -07:00
C. Guy Yarvin
7b4782053b Various fixes. 2014-09-06 23:11:09 -07:00
C. Guy Yarvin
1d1d4fc309 Testing properly. 2014-09-06 21:24:18 -07:00
C. Guy Yarvin
785f25d7a9 Jets almost loads. 2014-09-06 17:09:29 -07:00
C. Guy Yarvin
af5128c851 Closer to running a jet. 2014-09-06 15:39:28 -07:00
C. Guy Yarvin
464940e765 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-06 14:09:33 -07:00
C. Guy Yarvin
2578107992 With a simple dashboard. 2014-09-06 13:39:13 -07:00
C. Guy Yarvin
7cfdd36fab Change u2 to u3. 2014-09-05 13:13:24 -07:00
C. Guy Yarvin
f0d6edce20 A bunch of restructuring. 2014-09-05 12:55:16 -07:00
Ubuntu
63353684c8 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-05 16:22:22 +00:00
C. Guy Yarvin
ad19b035d0 Merge branch 'test' of git://github.com/urbit/urbit-new into test 
Conflicts:
	urb/urbit.pill
 2014-09-04 17:25:08 -07:00
C. Guy Yarvin
14c22cf9da Yes. 2014-09-04 10:03:38 -07:00
C. Guy Yarvin
68715087b2 More reorgs. 2014-09-03 20:44:53 -07:00
C. Guy Yarvin
2cc897c410 Last remains of old jet mangling. 2014-09-03 20:10:43 -07:00
C. Guy Yarvin
6fa6b15cb8 More renaming, etc. 2014-09-03 19:28:15 -07:00
C. Guy Yarvin
bd6bfa1fad Finish renaming etc. 2014-09-03 14:33:18 -07:00
Ubuntu
b833113e48 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-03 20:04:27 +00:00
Galen Wolfe-Pauly
4e037f134e Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-03 10:52:27 -07:00
Anton Dyudin
6cfd2d3219 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-03 00:20:19 -07:00
C. Guy Yarvin
6d52238ac1 Considerable refactorings. 2014-09-02 22:46:55 -07:00
C. Guy Yarvin
b4ce2f98f5 Update cq names. 2014-09-02 20:36:29 -07:00
C. Guy Yarvin
2d9af9f04e Before jet renaming. 2014-09-02 19:58:36 -07:00
johncburnham
c5c2019e6f Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2014-09-02 17:15:20 -07:00
C. Guy Yarvin
b75189b53e Pull in murmur3. 2014-09-02 13:45:49 -07:00
C. Guy Yarvin
dee4429462 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-02 13:13:36 -07:00
C. Guy Yarvin
882e8e226b Ready to switch over mug. 2014-09-02 13:13:12 -07:00