urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-17 23:32:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
966 Commits 768 Branches 10 Tags 215 MiB
b460c0f43a
Commit Graph

966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
b460c0f43a Merge remote-tracking branch 'origin/shell' into dish 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/terminal/hymn/script.js
 2014-10-30 16:48:18 -04:00
Ubuntu
544c7f5eb3 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 21:16:13 +00:00
Ubuntu
25465b3c80 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 21:11:32 +00:00
Ubuntu
e3719cb88f Merge branch 'shell' into dish 
Conflicts:
	urb/urbit.pill
 2014-10-23 21:11:10 +00:00
Anton Dyudin
6aa04ded5e Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 14:08:30 -07:00
Ubuntu
4d74ccf2f3 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 03:26:20 +00:00
Ubuntu
f73518b851 Merge branch 'shell' into dish 
Conflicts:
	urb/urbit.pill
 2014-10-23 03:20:13 +00:00
Ubuntu
29ba434833 Merge branch 'shell' into dish 
Conflicts:
	urb/urbit.pill
 2014-10-23 03:08:22 +00:00
Ubuntu
086d0d95f5 hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Anton Dyudin
7348399cf5 Merge branch 'shell' of https://github.com/urbit/urbit into shell 2014-10-16 16:43:05 -07:00
Ubuntu
1cd74683f0 removed clay timer from unix.c 2014-10-16 22:54:01 +00:00
Ubuntu
efb86a8d29 Merge branch 'shell' of https://github.com/urbit/urbit into shell 
Conflicts:
	urb/urbit.pill
 2014-10-15 02:28:46 +00:00
Ubuntu
383ab05977 added %time vane 2014-10-15 02:25:23 +00:00
Anton Dyudin
502abc8667 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-10 13:03:06 -07:00
Ubuntu
2289431b70 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-10 18:46:31 +00:00
Philip Monk
e492ebd706 Merge pull request #152 from amosjyng/patch-1 
Added g++ dependency
 2014-09-10 09:41:18 -07:00
Amos Ng
26bf9d4567 Added g++ dependency 2014-09-10 03:33:05 -04:00
Ubuntu
2b10d507d1 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-10 00:31:52 +00:00
Anton Dyudin
c490d7ad9c Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 14:33:51 -07:00
Anton Dyudin
ed74dee284 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 12:51:56 -07:00
Ubuntu
24583dcca5 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-09 18:53:36 +00:00
C. Guy Yarvin
464940e765 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-06 14:09:33 -07:00
Ubuntu
63353684c8 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-05 16:22:22 +00:00
C. Guy Yarvin
ad19b035d0 Merge branch 'test' of git://github.com/urbit/urbit-new into test 
Conflicts:
	urb/urbit.pill
 2014-09-04 17:25:08 -07:00
Ubuntu
b833113e48 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2014-09-03 20:04:27 +00:00
Galen Wolfe-Pauly
4e037f134e Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-03 10:52:27 -07:00
Anton Dyudin
6cfd2d3219 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-03 00:20:19 -07:00
johncburnham
c5c2019e6f Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2014-09-02 17:15:20 -07:00
C. Guy Yarvin
dee4429462 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-02 13:13:36 -07:00
C. Guy Yarvin
882e8e226b Ready to switch over mug. 2014-09-02 13:13:12 -07:00
johncburnham
cb713c65bf Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-02 00:04:53 -07:00
Ubuntu
47463e0cd5 Merge branch 'master' into test 2014-09-02 00:47:05 +00:00
Ubuntu
cce7efd0b6 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-01 17:43:49 +00:00
Ubuntu
431cdee1e8 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-28 17:20:02 +00:00
Ubuntu
86ff25423d Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 21:59:38 +00:00
Anton Dyudin
10d5eafb25 make зашибись 2014-08-27 14:42:33 -07:00
Ubuntu
e27b2657a5 Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test 
Conflicts:
	Makefile
 2014-08-27 18:22:34 +00:00
TJIC
e1a4bb7a20 it should be possible to type 'make distclean all' 2014-08-27 14:14:08 -04:00
ault011
0891bea8b0 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 19:00:56 -07:00
ault011
9d55744f75 WIP single-file site 2014-08-26 19:00:09 -07:00
Ubuntu
8160f931ea fixed ++mur 2014-08-26 19:49:31 +00:00
TJIC
0cec1c1d22 removed debugging printf 2014-08-26 15:16:10 -04:00
C. Guy Yarvin
a432bfbcf2 Merge branch 'test' of github.com:urbit/urbit into test 2014-08-26 12:12:17 -07:00
C. Guy Yarvin
e75d2e70b2 Add MurmurHash3. 2014-08-26 12:11:59 -07:00
ault011
b9b3d8e017 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 11:54:10 -07:00
Ubuntu
f23100ccc6 update dependency list in readme 2014-08-26 17:31:38 +00:00
Ubuntu
fb62c395ec Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 17:25:57 +00:00
Ubuntu
9ecfd2156a removed 'make' on distclean 2014-08-26 17:25:29 +00:00
johncburnham
2541655515 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 10:19:33 -07:00
Ubuntu
fd8aaa4ce3 Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test 2014-08-26 17:02:48 +00:00