urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-17 07:14:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,140 Commits 768 Branches 10 Tags 215 MiB
8cc712259e
Commit Graph

2140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raymond Pasco
12ad098758 Put 'test' on ice for outside contributors 2015-11-16 17:56:21 -05:00
Raymond Pasco
88caf29d20 Merge feature commits from former branch 'test' 
John Franklin libuv updating work
John Franklin / Charlie Cummings handy vere options
 2015-11-16 17:53:17 -05:00
Raymond Pasco
5e513cc527 Disable building with libuv 1.7.5 by default 2015-11-16 17:41:17 -05:00
John Franklin
1d79185707 Print libuv version in report(). 2015-11-16 17:34:49 -05:00
John Franklin
8201592594 Add command line option to report urbit build info. 2015-11-16 17:34:49 -05:00
Raymond Pasco
e743211baa Mac-specific OpenSSL header location 
pretty platform-specific, but hurts nothing on other platforms
 2015-11-16 17:34:49 -05:00
Charlie Cummings
82359145dd more args 2015-11-16 17:34:49 -05:00
John Franklin
7328874488 Build with libuv-v1.7.5 2015-11-16 17:34:49 -05:00
John Franklin
0b6d89db5c Add LIBUV-v1.7.5.md 2015-11-16 17:34:49 -05:00
John Franklin
58085e3203 Add outside/libuv-v1.7.5 2015-11-16 17:34:48 -05:00
Philip C Monk
975fb71bb8 Merge remote-tracking branches 'anton/bad-desk-escape' and 'curtis/trivial' into pending 2015-11-13 14:44:53 -05:00
Philip C Monk
df670cb7ee Merge branch 'forward-port-jfranklin9000-test', remote-tracking branches 'rsaarelm/master', 'curtis/trivial', 'anton/cord-paths', 'anton/no-treegen-heads', 'anton/md-pam' and 'anton/tree-header-fragment' into pending 
Ported jfranklin9000/test forward to master in 'forward-port-jfranklin9000-test'.

Fixes #538
 2015-11-10 15:12:45 -05:00
John Franklin
48c0e6e149 Print normal usage command when trying to create an existing planet/comet. 2015-11-10 15:12:03 -05:00
John Franklin
186ce78a03 Re-add normal urbit usage instructions to README.md. 2015-11-10 15:12:03 -05:00
vere
7f1b5d2ae8 Proper double-word merge. 2015-11-06 22:08:58 +00:00
Philip C Monk
09b3d33538 Merge remote-tracking branches 'curtis/trivial', 'anton/talk-commands' and 'ray/talk-noob' into pending 2015-11-06 15:46:19 -05:00
C. Guy Yarvin
a1c4465622 A bunch of minor doc/message fixes. 2015-11-05 13:26:23 -08:00
Philip C Monk
6ccd55fc33 Merge remote-tracking branch 'curtis/trivial' into pending 2015-11-04 18:58:34 -05:00
Philip C Monk
7a76c25c3e Merge branch 'fordreload' into pending 2015-11-04 18:44:39 -05:00
Philip C Monk
95b758b5e2 Merge remote-tracking branch 'galen/spam' into pending 2015-11-04 18:36:22 -05:00
Philip C Monk
c783d3d824 Merge remote-tracking branch 'galen/spam' into pending 2015-11-04 17:40:06 -05:00
Galen Wolfe-Pauly
349511903e Merge branch 'master' of github.com:urbit/urbit into spam 2015-11-04 14:28:22 -08:00
Philip C Monk
2d9513a5c6 Merge branch 'kidsort-fixed', remote-tracking branches 'wilderr/master', 'anton/talk-offline' and 'curtis/trivial' into pending 
kidsort-fixed is a fixed version of galen/kidsort.

fixes #516
 2015-11-04 13:46:13 -05:00
Galen Wolfe-Pauly
a7131fdd8a Merge branch 'master' of github.com:urbit/urbit into newdoc 2015-11-03 14:03:35 -08:00
vere
cc956e73e9 Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 22:02:06 +00:00
vere
eb005490d3 Merge remote-tracking branch 'curtis/newdoc' 2015-11-03 21:58:24 +00:00
Henry Ault
b6bff98d13 Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 12:50:23 -08:00
Philip C Monk
67735810a2 Merge remote-tracking branch 'anton/talk-audi' into pending 2015-11-03 15:30:18 -05:00
Philip C Monk
271e68302d Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 15:26:00 -05:00
Henry Ault
9ad8847c94 Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 11:58:48 -08:00
Anton Dyudin
6424521fbd organized .gitignore, removed a personal symlink 2015-10-27 11:57:37 -07:00
Raymond Pasco
d0aabf6fa3 Merge branch 'clean-karpi' 
gall fixes for performance
various curtis "fixes" and "improvements"
 2015-10-26 18:27:55 -04:00
C. Guy Yarvin
1fedcb9b72 Profiling fix 2015-10-26 17:51:46 -04:00
vere
943322f586 Merge branch 'pending' of https://github.com/galenwp/urbit 2015-10-26 18:33:03 +00:00
Galen Wolfe-Pauly
4a4fdf73d6 Merge branch 'master' of github.com:urbit/urbit into pending 2015-10-26 11:04:51 -07:00
Anton Dyudin
03d616e4c6 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-22 15:46:12 -07:00
Raymond Pasco
2ac5ff1cdb Forward-port extras/hoonSublime to test 2015-10-22 18:21:46 -04:00
Anton Dyudin
c560459bb4 Merge branch 'test' 2015-10-22 13:26:06 -07:00
Galen Wolfe-Pauly
ece4b7905a Merge branch 'master' of github.com:urbit/urbit into test 2015-10-22 11:52:29 -07:00
Anton Dyudin
dcd055fbf0 Merge branch 'test' 2015-10-22 10:17:39 -07:00
Anton Dyudin
20d6351c1a Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-22 10:15:48 -07:00
Anton Dyudin
e329bb727a Merge branch 'karpi' of https://github.com/cgyarvin/urbit-1 into test 2015-10-22 10:14:38 -07:00
Anton Dyudin
daa2fccd7d added Sublime syntax colouring mode 2015-10-22 10:14:16 -07:00
Raymond Pasco
ddca4e4ee7 Forward-port Jacob MacDonald hoon-mode fix to test 2015-10-22 01:34:30 -04:00
Raymond Pasco
fe06021c8a Merge remote-tracking branch 'jaccarmac/fix-emacs-parentheses' 
Emacs hoon-mode fix.
 2015-10-22 01:31:25 -04:00
Jacob MacDonald
fd387a0021 Fix nasty pseudo-comment. 
Resolve an error in Emacs where Emacs picks up a mismatched paren when loading
the whole file, but not when evaling each form individually.
 2015-10-21 23:20:56 -06:00
Anton Dyudin
c426926ed5 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-21 15:02:36 -07:00
Raymond Pasco
279f2f8d7d Merge remote-tracking branch 'jfranklin9000/all-tags' into test 2015-10-21 17:12:32 -04:00
pier on do
49349c1b7d Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-21 13:59:49 -04:00
pier on do
7384367baa Merge branch 'test' of https://github.com/urbit/urbit into test 2015-10-21 13:50:22 -04:00