Commit Graph

1299 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
f3748239bd various fixes and improvements 2014-12-09 18:15:22 -08:00
Philip C Monk
4b1f6899b1 Merge branch 'master' into radio
Conflicts:
	urb/urbit.pill
2014-12-09 20:39:36 -05:00
Anton Dyudin
61271adf08 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-09 15:51:46 -08:00
Philip C Monk
22bb473215 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2014-12-09 18:02:38 -05:00
Philip C Monk
c7b057dbbf fix ye olde dotket bug
fixes #194
2014-12-09 17:59:31 -05:00
Anton Dyudin
17c54076a6 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 19:16:57 -08:00
Anton Dyudin
de08d9e83a Moved sanitization logic to ++normalize 2014-12-08 19:16:00 -08:00
Philip C Monk
427ff60d92 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 19:01:42 -05:00
Philip C Monk
1de72c1e03 fix markdown jet memory leak 2014-12-08 19:01:28 -05:00
Anton Dyudin
139c4c61f9 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 15:45:23 -08:00
Galen Wolfe-Pauly
149f3d5879 Merge branch 'master' of github.com:urbit/urbit 2014-12-08 15:19:27 -08:00
Anton Dyudin
5baec16881 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 14:52:40 -08:00
Philip C Monk
84ff34955c fix sync memory leak on linux 2014-12-08 17:46:46 -05:00
Philip C Monk
3baefceab3 move markdown jet to u3a_calloc 2014-12-08 16:00:56 -05:00
cgyarvin
d57fbc9fcc Merge pull request #207 from gkelly/show-bail-before-abort
Show the how of a bail in more cases.
2014-12-06 15:32:28 -08:00
Garret Kelly
e5e142c6ea Show the how of a bail in more cases. 2014-12-06 21:12:12 +00:00
Philip C Monk
e753562812 remove markdown printfs 2014-12-05 20:46:52 -05:00
Philip C Monk
c4473250a0 general cmark cleanup 2014-12-05 20:34:58 -05:00
Philip C Monk
801bf92893 updated dependency list 2014-12-05 16:55:27 -05:00
Philip C Monk
a188a24343 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-05 16:10:48 -05:00
Philip C Monk
cef42f4d21 clear terminal backlog in ++prep 2014-12-05 16:09:46 -05:00
Anton Dyudin
52f4293639 Update README.markdown
Add cmake dependency
2014-12-05 12:29:13 -08: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
Philip C Monk
451e652c40 half the markdown jet 2014-12-03 23:58:49 -05:00
Philip C Monk
b24550e981 fix build 2014-12-03 18:40:35 -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
Philip C Monk
ac9756ef59 Merge commit '7894810906c8213feba3ebd7be89b62a6ed89122' as 'outside/commonmark' 2014-12-03 17:03:42 -05:00
Philip C Monk
7894810906 Squashed 'outside/commonmark/' content from commit cfb756f
git-subtree-dir: outside/commonmark
git-subtree-split: cfb756f918aad3ef7714f75a06210e564ecb90f9
2014-12-03 17:03:42 -05:00
C. Guy Yarvin
d9d18f766e Hack around ~(tap to) bug. 2014-12-03 11:58:42 -08:00
C. Guy Yarvin
e09388ae70 Revert previous change. 2014-12-03 11:17:32 -08:00
C. Guy Yarvin
10da2be5d4 Enable profiling on Linux. 2014-12-03 11:15:22 -08:00
C. Guy Yarvin
eaef1bbf7a Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2014-12-03 09:46:54 -08:00
C. Guy Yarvin
22cd6974d9 Profile tweaks. 2014-12-03 09:36:42 -08:00
Philip C Monk
124cf24c06 change linux LoomBase to 32bit-safe one 2014-12-02 21:06:06 -05:00
Philip C Monk
2e72c44d80 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-02 20:07:22 -05:00
C. Guy Yarvin
23ca537b56 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2014-12-02 16:28:02 -08:00
C. Guy Yarvin
f50b3b3c3c More profiling updates. 2014-12-02 16:26:30 -08:00
C. Guy Yarvin
11c02c11d9 Update some profiling stuff. 2014-12-02 13:53:35 -08:00
Philip C Monk
13b84fffc0 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-01 17:51:08 -05:00
C. Guy Yarvin
ee5ef2e7ed Fix profile bug. 2014-12-01 14:05:09 -08:00
C. Guy Yarvin
3453a8ba5c Remove debug code. 2014-11-30 23:32:19 -08:00
C. Guy Yarvin
f56aa55a32 Remove overly fancy profile sync code. 2014-11-30 16:59:22 -08: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
ee49973664 Remove annoying printf. 2014-11-30 02:30:45 -08:00
C. Guy Yarvin
b34b8633de Merge branch 'master' of https://github.com/urbit/urbit 2014-11-30 02:16:24 -08:00
C. Guy Yarvin
81455138c3 Fix some profiling stuff. 2014-11-30 02:06:41 -08:00