Commit Graph

1437 Commits

Author SHA1 Message Date
Philip C Monk
bcd3b98e1f massing works without U3_MEMORY_DEBUG 2015-05-11 19:47:53 -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
Philip C Monk
b84aa72678 checkpoint 2015-05-07 19:16:54 -04:00
Philip C Monk
0ca2fc94de added space profiling tools 2015-05-06 22:25:41 -04: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
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
Anton Dyudin
8008e5fb90 improve init printf 2015-05-01 11:40:01 -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
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
b6cfc75fd5 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-04-08 15:06:29 -07:00
Galen Wolfe-Pauly
4943ca19cf Merge branch 'master' of github.com:urbit/urbit-new 2015-04-08 11:46:14 -07:00
C. Guy Yarvin
a53f27ae64 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2015-04-08 11:36:01 -07:00
Philip C Monk
6a4d9d4914 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-08 14:28:02 -04:00
Philip C Monk
479d2dbf06 added :helm+init 2015-04-08 14:27:51 -04:00
Philip C Monk
6b540820ad Merge branch 'master' of https://github.com/urbit/urbit 2015-04-07 19:16:18 -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
9c66b9cddc Merge branch 'master' into dillbo
Conflicts:
	urb/zod/docs/pub/doc/guide/a-ford.md
2015-04-07 15:18:07 -07:00
C. Guy Yarvin
b5c216a65d Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-01 14:03:40 -07: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 Monk
c99402d080 Merge pull request #268 from TJamesCorcoran/master
emacs tweak, ford doc tweak
2015-03-30 11:11:17 -07:00
C. Guy Yarvin
4fc55346aa Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo
Conflicts:
	urb/urbit.pill
2015-03-27 13:08:04 -07:00
TJamesCorcoran
27a0e0e1dc smarter way to accomplish the verbosity on the mode line: rename-buffer 2015-03-27 14:03:03 -04:00
cgyarvin
2366c1b190 Merge pull request #267 from mrdomino/calloc-overflow
Overflow detection in u3a_calloc
2015-03-27 10:54:26 -07:00
Steven Dee
b5343f227b Overflow detection in u3a_calloc
This implementation assumes that u3a_calloc is always called with
safe sizes and just asserts that.
2015-03-27 12:14:23 -04:00
Philip C Monk
f62ff0fd66 notification-only subscription path 2015-03-26 19:26:39 -04:00
Galen Wolfe-Pauly
93dc541115 here comes talk 2015-03-26 14:00:45 -07:00
Anton Dyudin
01d403b2a6 Merge branch 'eyre-new' into dillbo
Conflicts:
	urb/urbit.pill
2015-03-26 13:33:08 -07:00
Philip Monk
713b2af685 Merge pull request #266 from TJamesCorcoran/master
modeline bar improvements
2015-03-26 11:38:32 -07:00
TJamesCorcoran
a500899603 modeline bar better 2015-03-26 14:32:56 -04:00
Philip C Monk
adca2c2353 fix 7MB/revision memory leak 2015-03-25 18:35:47 -04:00
Galen Wolfe-Pauly
3312d319b9 Merge branch 'dillbo' into talk 2015-03-25 14:06:08 -07:00
Galen Wolfe-Pauly
337dc5d45d Merge branch 'dillbo' into talk 2015-03-25 11:59:44 -07:00
Galen Wolfe-Pauly
66773c8e31 Merge branch 'dillbo' into talk 2015-03-24 17:37:17 -07:00
Galen Wolfe-Pauly
4e7d3dcf7b Merge branch 'dillbo' into talk 2015-03-24 17:16:00 -07: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
Anton Dyudin
add40d4dee Fixed ford ot anchor at current main revision, not time
Conflicts:
	n/t.c
	urb/zod/main/arvo/ford.hoon
	v/raft.c
2015-03-24 19:27:49 -04:00
Philip C Monk
7daed9bcb3 waypoint 2015-03-24 17:46:32 -04:00