Commit Graph

1412 Commits

Author SHA1 Message Date
C. Guy Yarvin
0c5492adda More cold state. 2014-11-18 12:59:59 -08:00
C. Guy Yarvin
23a0228e7f More calx adjustments. 2014-11-18 10:56:28 -08:00
C. Guy Yarvin
2282f050f7 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-18 10:39:53 -08:00
C. Guy Yarvin
7598994ba4 More calx adjustments. 2014-11-18 02:49:03 -08:00
C. Guy Yarvin
9a06716750 More calx tweaking. 2014-11-17 18:06:09 -08:00
C. Guy Yarvin
f205df3e66 More calx mayhem. 2014-11-17 15:57:08 -08:00
Philip C Monk
e3f887f2cd Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-17 18:34:33 -05:00
C. Guy Yarvin
43eeb64fc7 Another jet state adjustment. 2014-11-17 15:24:40 -08:00
C. Guy Yarvin
031856b0ef Re-restructure calx. 2014-11-17 14:57:05 -08:00
C. Guy Yarvin
5332ae57a3 Revert jet code to un-break. 2014-11-17 14:12:11 -08:00
C. Guy Yarvin
3e7455a14e This commit is broken! 2014-11-17 13:56:51 -08:00
Philip C Monk
a159bca4f3 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-17 16:20:08 -05:00
Philip C Monk
d62d8fb6fd added private messaging in chat 2014-11-17 16:19:51 -05:00
C. Guy Yarvin
cf1dbcb128 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-15 18:19:11 -08:00
C. Guy Yarvin
1055dc00e7 Restructure calx. 2014-11-15 17:24:19 -08:00
C. Guy Yarvin
dfbd88b7b9 Various fixes and improvements. 2014-11-15 17:10:15 -08:00
C. Guy Yarvin
f3fba50144 Moar edits. 2014-11-15 17:10:05 -08:00
Jared Hance
e54f4699ee Fix distclean 2014-11-13 18:54:14 -05:00
Jared Hance
cf743aa690 Revert "Add shortrules to Makefile, enable."
This reverts commit 58d7bf855e7fc3733ec43cc63147910c4d4a5727.
2014-11-13 18:34:10 -05:00
Jared Hance
324186166c Majorly unscrew the build system 2014-11-13 18:33:46 -05:00
vere
9066a62638 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	v/unix.c
2014-11-12 19:57:45 +00:00
Philip C Monk
6f068cc377 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-11 19:51:06 -05:00
C. Guy Yarvin
6585c016c9 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-11 13:50:06 -08:00
C. Guy Yarvin
9b4da218aa Solve malloc alignment issues. 2014-11-11 13:49:45 -08:00
C. Guy Yarvin
16952e13f8 Band-aid on a clay timer bug. 2014-11-11 11:03:16 -08:00
vere
fa02dcfba8 Fix clay timer explosion on zod. 2014-11-11 02:36:13 +00:00
Galen Wolfe-Pauly
ed683044c5 hn 2014-11-08 19:12:06 -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
3bdcfedb2a Merge remote-tracking branch 'origin/test' into dish 2014-11-06 17:09:18 -05:00
C. Guy Yarvin
9ad1e215bb Turn off profiling interrupts. 2014-11-06 14:08:37 -08:00
Philip C Monk
e5896b388d Merge remote-tracking branch 'origin/test' into dish 2014-11-06 17:05:07 -05: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
a4a1cd8705 More error. 2014-11-06 14:04:02 -08:00
C. Guy Yarvin
b7c712753c Print status code on HTTP error. 2014-11-06 14:02:33 -08: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
8c8fa11104 Rename. 2014-11-06 11:13:57 -08:00
C. Guy Yarvin
7b05fc96d1 Moar doc. 2014-11-05 19:12:47 -08:00
C. Guy Yarvin
ec9caad659 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	i/all.h
	i/g/a.h
	i/j/k.h
	i/j/q.h
	i/j/w.h
	j/1/gte.c
	j/1/gth.c
	j/1/lte.c
	j/1/lth.c
	j/4/by_has.c
	j/4/in_has.c
	j/5/loss.c
	j/5/parse.c
	j/5/tape.c
	j/6/fitz.c
	j/6/ut_conk.c
	j/6/ut_cull.c
	j/6/ut_fire.c
	j/6/ut_mint.c
	j/6/ut_mull.c
	j/6/ut_nest.c
	j/6/ut_park.c
	j/6/ut_rest.c
	v/ames.c
	v/cttp.c
	v/loop.c
	v/main.c
	v/raft.c
	v/reck.c
	v/sist.c
	v/term.c
	v/unix.c
2014-11-05 19:12:15 -08:00
C. Guy Yarvin
a2ba265d99 Renaming, renaming. 2014-11-05 19:10:22 -08:00
C. Guy Yarvin
5d6d7afb15 Moar renaming. 2014-11-05 17:32:33 -08:00
C. Guy Yarvin
4855a9d1d8 Another great renaming. 2014-11-05 16:20:01 -08:00
C. Guy Yarvin
138711c7cd Another great renaming. 2014-11-05 16:02:36 -08:00
C. Guy Yarvin
87d8169c57 Fix sed follies. 2014-11-05 15:36:30 -08:00
C. Guy Yarvin
a7215257ac Some renamings and cleanups. 2014-11-05 13:54:52 -08:00
Philip C Monk
b605f9f2b4 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-11-05 14:44:54 -05:00
C. Guy Yarvin
dbe046620a Move loobeans from u3 to c3. 2014-11-04 17:18:47 -08:00
C. Guy Yarvin
ceb35b892c About to rename loobeans. 2014-11-04 17:09:17 -08:00
C. Guy Yarvin
2ca5ae560d Another experimental renaming. 2014-11-04 16:53:07 -08:00