ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 20:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,061 Commits 6 Branches 0 Tags 164 MiB
7a4651bac5
Commit Graph

2061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
ac12d4fea3 Merge branch 'workfix' into test 
Conflicts:
	urb/zod/ape/dojo.hoon
 2015-09-11 15:15:11 -04:00
Galen Wolfe-Pauly
213e1f727c Merge branch 'test' of github.com:urbit/urbit into test 2015-09-10 21:26:58 -07:00
Galen Wolfe-Pauly
701841f057 Merge branch 'test' of github.com:galenwp/urbit into test 2015-09-10 19:35:55 -07:00
Philip C Monk
b9bad5c1c9 Merge branch 'clayhammer' 2015-09-10 18:39:00 -04:00
Raymond Pasco
99b1a4ef44 Merge branch 'yebyen-patchset' into test 2015-09-10 18:00:37 -04:00
Raymond Pasco
e71fbfad04 Merge branch 'yebyen-patchset' 
Closes #400
 2015-09-10 17:59:15 -04:00
Kingdon
2bb098c1ed patchset 2015-09-10 17:56:02 -04:00
Philip C Monk
7b52cb9c16 Merge branch 'master' into test 2015-09-10 14:39:24 -04:00
Philip C Monk
60079d7676 Merge remote-tracking branch 'origin/pending' 2015-09-10 14:35:43 -04:00
Philip C Monk
cff2c91273 Merge remote-tracking branch 'origin/pending' 2015-09-10 14:00:14 -04:00
Anton Dyudin
dd71add6c3 Merge branch 'pending' of https://github.com/urbit/urbit into pending 2015-09-10 10:28:03 -07:00
Raymond Pasco
6dd1f8c5d9 Merge remote-tracking branch 'yebyen/master' into test 2015-09-10 07:10:36 -04:00
Raymond Pasco
2771404e2f Merge remote-tracking branch 'yebyen/master' into pending 2015-09-10 07:10:12 -04:00
Raymond Pasco
f61cdb9925 Merge remote-tracking branch 'yebyen/master' 2015-09-10 07:08:37 -04:00
Kingdon
f0d6f92584 update reference 2015-09-10 00:56:13 -04:00
Anton Dyudin
116d64753e Merge branch 'nobreach' into pending 2015-09-09 18:15:04 -07:00
Anton Dyudin
1094ec0540 Merge branch 'nobreach' into pending 2015-09-09 16:54:34 -07:00
Anton Dyudin
4e91dd1a7d Merge branch 'pending' into nobreach 2015-09-09 16:53:46 -07:00
Anton Dyudin
dec6320b82 newline on bail 2015-09-09 16:52:53 -07:00
Philip C Monk
cd73e722fd Merge branch 'pending' 2015-09-09 19:17:40 -04:00
Philip C Monk
5bdd1e4503 Merge branch 'clayhammer' into pending 
Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
 2015-09-09 19:15:26 -04:00
Philip C Monk
ba407c6d37 Merge branch 'master' into pending 2015-09-09 17:32:49 -04:00
Philip C Monk
57ebf20b44 Merge remote-tracking branch 'origin/test' into pending 2015-09-09 17:32:02 -04:00
Anton Dyudin
2b8b5872d7 Merge branch 'nobreach' into pending 2015-09-09 14:20:39 -07:00
Anton Dyudin
bdfe82f9a9 Merge branch 'pending' into test 2015-09-08 13:28:15 -07:00
vere
2f4da4c827 Merge branch 'pending' of https://github.com/urbit/urbit into pending 2015-09-08 19:24:45 +00:00
Raymond Pasco
cad8b3b20d Merge remote-tracking branch 'chc4/socket' into test 2015-09-04 22:12:53 -04:00
Charlie Cummings
98760f8e38 hide libuv socket errors 2015-09-04 18:49:09 -04:00
Philip C Monk
a8d59bf7a3 performance improvements 2015-09-03 17:14:35 -04:00
Anton Dyudin
6eb03f0e29 Merge remote-tracking branch 'urbit/pending' into pittyp 2015-09-02 17:42:33 -07:00
Anton Dyudin
25175c6a57 Merge commit '935f8922b' into pittyp 2015-09-02 17:42:22 -07:00
Galen Wolfe-Pauly
2c593d4aac Merge branch 'apps' into pending 2015-09-02 16:43:22 -07:00
Galen Wolfe-Pauly
1b05fe430c Merge branch 'apps' into pending 2015-09-02 16:41:38 -07:00
Galen Wolfe-Pauly
b16bd89e11 Merge branch 'apps' into pending 2015-09-02 16:33:14 -07:00
Galen Wolfe-Pauly
01131f354b Merge branch 'apps' into pending 2015-09-02 16:23:39 -07:00
Galen Wolfe-Pauly
c24ede60b2 Merge branch 'apps' into test 2015-09-02 16:18:06 -07:00
Philip C Monk
240599a7b8 Merge branch 'apps' into pending 2015-09-02 16:40:37 -04:00
vere
e5100784de Merge remote-tracking branch 'origin/pending' 2015-09-02 19:09:46 +00:00
Galen Wolfe-Pauly
09123011f5 formatting 2015-09-02 11:32:15 -07:00
Galen Wolfe-Pauly
37e4aa0b4f contributing link, and why not .md? 2015-09-02 11:17:41 -07:00
vere
3ef7775340 Merge branch 'master' of https://github.com/urbit/urbit 2015-09-01 17:41:10 +00:00
cgyarvin
5ab9b1c276 Merge pull request #395 from max19/debianrules 
fix #394 (debian/rules)
 2015-09-01 10:36:38 -07:00
Max G
0ead150172 fix #394 (debian/rules) 2015-09-01 19:41:34 +03:00
Anton Dyudin
50ba60b528 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-08-31 17:12:53 -07:00
Anton Dyudin
118b2c2b0e Merge branch 'apps' into test 2015-08-31 17:06:12 -07:00
Galen Wolfe-Pauly
e3ba068424 compiled js conflict 2015-08-31 15:52:00 -07:00
Raymond Pasco
a239cff5cc Merge branch 'contributing.md-hotfix' into test 2015-08-29 10:17:40 -04:00
Raymond Pasco
a49ad7a0a7 Clarify the situations when a new pill is needed 2015-08-29 10:13:04 -04:00
Alex Higgins
67bc87ab23 Fixed minor issues 2015-08-28 11:47:30 -05:00
Alex Higgins
941af0b677 Fix alignments in jets/f 2015-08-28 11:34:36 -05:00