urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-07 05:26:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,430 Commits 768 Branches 10 Tags 215 MiB
c1617611ed
Commit Graph

187 Commits

Author SHA1 Message Date
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
52be4718b4 annotated merges seem to be working 2015-04-13 17:29:39 -04: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
Philip C Monk
f0be8165ad bug fixing 2015-04-08 20:51:34 -04:00
Philip C Monk
0be5716a46 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-07 18:49:43 -04:00
C. Guy Yarvin
5802a4e52d Various fixes and improvements. 2015-04-01 13:56:43 -07:00
Philip C Monk
e8870285ac make subs boot again 2015-03-31 15:52:47 -04:00
Philip C Monk
f62ff0fd66 notification-only subscription path 2015-03-26 19:26:39 -04:00
Anton Dyudin
2669bcf0f5 Merge branch 'master' into eyre-new 
Conflicts:
	urb/urbit.pill
	urb/zod/docs/pub/doc/arvo/util.md
 2015-03-24 17:01:13 -07:00
Philip C Monk
7daed9bcb3 waypoint 2015-03-24 17:46:32 -04:00
Philip C Monk
ff276ba88d Merge branch 'master' of https://github.com/urbit/urbit 2015-03-12 16:24:55 -04:00
Steven Dee
c4b3e47e87 Use pwd command, not PWD env var 
So, sometimes PWD isn't exported. Like if you're in some kind of
weird sudo login session or something.

I don't know. It was broken for me. This fixed it.
 2015-03-05 21:00:51 -05:00
Philip C Monk
0eecbb466a Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
 2015-03-05 18:27:07 -05:00
Philip C Monk
b248466526 Merge branch 'master' of https://github.com/urbit/urbit 2015-03-02 16:51:33 -05:00
Steven Dee
21242e9c61 Conditionally disable unused-result on OpenBSD 2015-03-02 16:44:21 -05:00
Philip C Monk
8df018b0b0 fixed linux build 2015-03-02 14:06:36 -05:00
Steven Dee
63908d386e Fix linux build 2015-03-02 14:04:20 -05:00
Steven Dee
6173d1577c Fixes for OpenBSD build 2015-03-02 13:36:46 -05:00
Philip C Monk
cbcb62459a move along, nothing to see here 2015-02-27 01:35:41 -05:00
Anton Dyudin
479311153d de-DGHETTO 2015-02-20 13:50:30 -08:00
Anton Dyudin
aa1cfca2dd dbg wip 2015-02-19 21:27:23 -08:00
Garret Kelly
06323bab3c Ignore unused return values for functions that care. 2014-12-19 19:08:05 +00:00
C. Guy Yarvin
ac95c203d0 CORRECT AND FINAL approach to missing field initializers :-) 2014-12-19 10:22:56 -08:00
Garret Kelly
eb92f8c3d0 Remove -Werror from Makefile. 2014-12-18 22:59:19 +00:00
Steven Dee
44d0079f9a Introduce some more warnings 
Actually this only causes a few missing field initializer warnings to
show up in the jet code. I disabled sign-compare and unused-parameter
outright because they were too noisy.
 2014-12-11 19:02:53 -05:00
Philip C Monk
cef42f4d21 clear terminal backlog in ++prep 2014-12-05 16:09:46 -05:00
Philip C Monk
c77dfba7dc fix makefile 2014-12-04 16:29:49 -05:00
Philip C Monk
0e44d99264 really fix makefile 2014-12-04 16:23:31 -05:00
Philip C Monk
10cbe40871 fix makefile 2014-12-04 16:21:33 -05:00
C. Guy Yarvin
b927a7bf78 Add test user-level jet. 2014-12-03 15:21:55 -08:00
Philip C Monk
afff845f97 link commonmark from outside/ 2014-12-03 17:07:01 -05:00
C. Guy Yarvin
53eae798e2 100 profile samples per second, in theory anyway. 2014-11-30 16:08:28 -08:00
C. Guy Yarvin
ce8afd76ee Various profiling and other fixes. 2014-11-30 16:06:08 -08:00
C. Guy Yarvin
81455138c3 Fix some profiling stuff. 2014-11-30 02:06:41 -08:00
C. Guy Yarvin
b3a64933bc Ready to test profiling. 2014-11-28 18:19:11 -08:00
Jared Hance
324186166c Majorly unscrew the build system 2014-11-13 18:33:46 -05:00
C. Guy Yarvin
9b4da218aa Solve malloc alignment issues. 2014-11-11 13:49:45 -08:00
C. Guy Yarvin
d1e64e60da Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-07 14:55:15 -08:00
C. Guy Yarvin
4815cbcfa6 Before gmp malloc changeover. 2014-11-07 14:54:59 -08:00
Philip C Monk
b1ca1c5322 Merge remote-tracking branch 'origin/test' into dish 
Conflicts:
	i/v/vere.h
 2014-11-06 17:04:57 -05:00
C. Guy Yarvin
8cbbcfd67d More renaming. 2014-11-06 11:49:41 -08:00
C. Guy Yarvin
6e9e1443a5 Relocation. 2014-11-06 11:29:53 -08:00
C. Guy Yarvin
a7215257ac Some renamings and cleanups. 2014-11-05 13:54:52 -08:00
C. Guy Yarvin
f1ee2f6e90 Merge branch 'test' of https://github.com/urbit/urbit into test 
ssary,
 2014-11-04 16:41:26 -08:00
C. Guy Yarvin
40a8c6fc74 Various cleanups and renamings, part 1. 2014-11-04 16:29:08 -08:00
Philip C Monk
7b91a3c475 Merge branch 'test' into dish 
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	urb/zod/arvo/hoon.hoon
	v/loop.c
	v/raft.c
 2014-11-04 16:42:02 -05:00
Philip C Monk
92740bc47c Merge branch 'test' into shell 
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/clay.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/main/mar/hook/door.hook
	urb/zod/main/mar/psal/door.hook
	urb/zod/main/mar/txt/door.hook
	urb/zod/main/pub/src/doc/ref/vol/1.md
	v/loop.c
	v/raft.c
	v/reck.c
	v/unix.c
 2014-11-04 15:22:33 -05:00
C. Guy Yarvin
7ad5879c9c Various fixes and improvements. 2014-10-30 14:40:05 -07:00
C. Guy Yarvin
109053ecf1 Various fixes and improvements. 2014-10-28 10:36:22 -07:00
C. Guy Yarvin
30392202a9 Various fixes and improvements. 2014-10-25 14:28:14 -07:00