urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-16 06:51:14 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,631 Commits 768 Branches 10 Tags 215 MiB
3c5cbb3921
Commit Graph

1631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chc4
deff75f7f8 half-update readme 
Update a good portion of the readme, since the old one was horribly out of date and from 2013.

I manually changed the path and ship name to match the old one, which might not have been the correct thing to do.
It still needs a bit of work to make all the information correct.
 2015-05-09 15:12:43 -04:00
Philip C Monk
1edf15843f added U3_CELLOC_TOGGLE 2015-05-08 21:22:11 -04:00
Philip C Monk
3155535c80 space profiling works with U3_MEMORY_DEBUG 2015-05-08 20:42:09 -04:00
Galen Wolfe-Pauly
50a5989751 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-08 15:00:45 -07:00
Galen Wolfe-Pauly
b388b433a3 talk updates 2015-05-08 13:29:24 -07:00
Philip C Monk
b84aa72678 checkpoint 2015-05-07 19:16:54 -04:00
Henry Ault
e5a6e84012 merge test 2015-05-07 14:34:49 -07:00
Anton Dyudin
eab2b1884d Merge branch 'test' 2015-05-07 10:31:10 -07:00
Anton Dyudin
ece8ed37d7 Merge branch 'space-tools' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/time.hoon
 2015-05-07 10:30:32 -07:00
Philip C Monk
0ca2fc94de added space profiling tools 2015-05-06 22:25:41 -04:00
C. Guy Yarvin
a8f321cc55 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-06 19:13:15 -07:00
C. Guy Yarvin
7fb84652e8 Run test in optimized. 2015-05-06 18:25:58 -07:00
Henry Ault
71240536df Merge branch 'test' into do 2015-05-06 14:05:58 -07:00
Henry Ault
7055674deb ignore swap files 2015-05-06 13:58:54 -07:00
Philip C Monk
036fd00b70 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-05 19:43:36 -04:00
Philip C Monk
0a483a1b63 fixed a slew of memory leaks 2015-05-05 19:42:00 -04:00
Anton Dyudin
e67f49cf4b HEAD requests 2015-05-05 14:24:48 -07:00
cgyarvin
080cd90913 Merge pull request #277 from urbit/revert-276-revert-275-master 
Revert "Revert "Jetted scrypt""
 2015-05-03 16:32:12 -07:00
cgyarvin
b812d16b0a Revert "Revert "Jetted scrypt"" 2015-05-03 16:31:45 -07:00
cgyarvin
31104b226c Merge pull request #276 from urbit/revert-275-master 
Revert "Jetted scrypt"
 2015-05-03 16:29:24 -07:00
cgyarvin
ca99ef63e7 Revert "Jetted scrypt" 2015-05-03 16:28:51 -07:00
C. Guy Yarvin
88ffabf951 Binary accidentally checked into GH. 2015-05-03 16:24:09 -07:00
cgyarvin
6d2a603571 Merge pull request #275 from Hmmm-Max/master 
Jetted scrypt
 2015-05-03 16:21:36 -07:00
Max G
7443c352e1 new bounds 2015-05-03 23:45:41 +03:00
Max G
97d679ee69 fixed jet discrepancy 2015-05-03 16:02:14 +03:00
Max G
0385e3a701 Jetted scrypt 2015-05-03 15:26:42 +03:00
Anton Dyudin
12ed8c11af Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-01 15:09:59 -07:00
Philip C Monk
089dd10519 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-01 16:41:34 -04:00
Henry Ault
f0d56210f6 small update 2015-05-01 12:05:16 -07:00
Anton Dyudin
8008e5fb90 improve init printf 2015-05-01 11:40:01 -07:00
Henry Ault
7711cde6de reboot! 2015-04-30 20:22:05 -07:00
C. Guy Yarvin
539ac35f52 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:14:53 -07:00
C. Guy Yarvin
8f23a0f943 Reenable optimization in master. 2015-04-30 17:13:23 -07:00
C. Guy Yarvin
c1617611ed Remove debug hack. 2015-04-30 15:58:34 -07:00
Philip C Monk
de2dff2558 Merge branch 'typedclay' 2015-04-30 18:12:00 -04:00
Philip C Monk
3c80736297 Merge branch 'dropped' into typedclay 2015-04-30 18:08:52 -04:00
C. Guy Yarvin
6e44ee1741 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 15:06:16 -07:00
Henry Ault
0f3c7d5303 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-04-29 14:00:53 -07:00
Philip C Monk
84323967cb 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
31e80487a1 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
3576479a50 cal in mate/meld 2015-04-20 16:42:18 -04:00
Philip C Monk
52be4718b4 annotated merges seem to be working 2015-04-13 17:29:39 -04:00
Philip Monk
c8862a9913 Merge pull request #271 from mrdomino/revert-bad-make 
Revert "fixed linux build"
 2015-04-13 11:18:54 -07:00
Steven Dee
f4e8eac6de Revert "fixed linux build" 
Guys. We already did this. Just not for *BSD.

This reverts commit e6becced960b6a35cfcd75f123a3d63152430318.
 2015-04-13 10:46:37 -04:00
C. Guy Yarvin
3d8a22b094 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-11 15:03:09 -07:00
Galen Wolfe-Pauly
c14e45ff58 Merge branch 'test' of github.com:urbit/urbit into test 2015-04-10 10:55:24 -07:00
Galen Wolfe-Pauly
92a901a02d Merge branch 'test' of github.com:urbit/urbit into test 2015-04-09 10:13:44 -07:00
Anton Dyudin
3c8617b141 Merge remote-tracking branch 'origin/test' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-04-08 18:42:06 -07:00
Philip C Monk
f0be8165ad bug fixing 2015-04-08 20:51:34 -04:00
C. Guy Yarvin
ff7904904d Fix ^F bug. 2015-04-08 17:29:19 -07:00