Commit Graph

1589 Commits

Author SHA1 Message Date
Raymond Pasco
5356f9268a AWS needs c++ 2015-06-17 14:34:25 -04:00
Galen Wolfe-Pauly
652c5afcd2 Merge branch 'master' of github.com:urbit/urbit 2015-06-17 10:21:29 -07:00
Galen Wolfe-Pauly
f28fcb1d7e register -> begin 2015-06-17 10:21:25 -07:00
Galen Wolfe-Pauly
0740c31020 Merge pull request #298 from Tenari/patch-1
typo fix
2015-06-16 18:58:45 -07:00
Daniel Zapata
223a534e16 typo fix 2015-06-16 20:56:58 -05:00
Galen Wolfe-Pauly
47857f071d new readme 2015-06-16 18:27:28 -07:00
Galen Wolfe-Pauly
d4e76bf750 simpler readme 2015-06-16 18:25:32 -07:00
Philip Monk
fe19cb23e7 Merge pull request #291 from rastus-vernon/patch-1
Fix copyright notice
2015-06-11 22:23:33 -07:00
Rastus Vernon
11edba2f08 Change copyright owner to "Urbit"
The copyright notice mentioned the Free Software Foundation, while the
LICENSE.txt file mentions simply "Urbit". It makes sense to change it to
the latter.

Also added myself to contributors.
2015-06-12 01:19:54 -04:00
Rastus Vernon
933ad886c2 Fix the copyright year 2015-06-12 01:05:22 -04:00
Philip C Monk
6f21b511a2 put c errors in stack trace 2015-06-10 23:59:08 -04:00
ault011
138ca1c14b updated :+helm?begin to :?begin 2015-06-09 17:31:27 -07:00
Philip Monk
61bd56e358 Merge pull request #287 from chc4/patch-1
Proper :talk instructions
2015-06-07 09:13:11 -07:00
chc4
73972d558c Proper :talk instructions
Doing a `;join /urbit-meta` from the initial :talk prompt only works if you are running a destroyer. Since this is the readme and it claims they aren't giving out destroyers (;D), there is a good chance the reader is running a sub, which need the full path for the room to join.
2015-06-06 23:19:48 -04:00
Galen Wolfe-Pauly
a3b18f2ed6 no demo 2015-06-03 16:39:11 -07:00
Philip C Monk
95867fafcf ignore dry/wet directory distinction 2015-06-02 15:59:39 -04:00
Anton Dyudin
75dcff7dd0 Merge branch 'test'@0b9d56f
Conflicts:
	urb/urbit.pill
2015-05-26 14:45:48 -07:00
demo
1817064468 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-25 19:14:34 +00:00
demo
ca024f1ceb better ssl error reporting 2015-05-25 19:14:20 +00:00
Galen Wolfe-Pauly
18d70ee885 bin/viere -> bin/urbit in readme 2015-05-25 10:38:26 -07:00
Anton Dyudin
8a28e44e7f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-21 17:40:05 -07:00
Henry Ault
1555c3acfa Merge branch 'do' into test 2015-05-21 17:24:09 -07:00
Anton Dyudin
7b2ad984b0 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-21 16:04:11 -07:00
C. Guy Yarvin
77e08e1b1f Merge branch 'master' of https://github.com/urbit/urbit 2015-05-21 15:35:30 -07:00
C. Guy Yarvin
82eca79910 No dirty pages 2015-05-21 15:35:14 -07:00
C. Guy Yarvin
6088ddcef5 No dirty pages. 2015-05-21 15:34:49 -07:00
Philip C Monk
31dfd24dc5 plug new memory leak 2015-05-21 15:15:41 -04:00
Philip C Monk
36ac4e041d Merge branch 'nextbreach'
Conflicts:
	urb/urbit.pill
2015-05-21 13:49:21 -04:00
C. Guy Yarvin
ed40602cbe Fix up demo a little bit. 2015-05-21 09:05:14 -07:00
C. Guy Yarvin
3a790011f6 Merge branch 'master' into test 2015-05-20 23:17:02 -07:00
C. Guy Yarvin
f1491de7f4 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 23:09:05 -07:00
Philip C Monk
fa17629697 improved unix sync 2015-05-20 20:32:54 -04:00
C. Guy Yarvin
bb97c37d46 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-20 16:59:17 -07:00
C. Guy Yarvin
9c8222ea02 Merge branch 'test' 2015-05-20 16:58:58 -07:00
Anton Dyudin
277bfda9af Update commands.txt 2015-05-20 15:25:25 -07:00
Anton Dyudin
787fa17eba Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 15:13:42 -07:00
Henry Ault
a4a2f0c789 Merge branch 'do' of https://github.com/urbit/urbit into do
Conflicts:
	urb/zod/base/ape/bit/core.hook
2015-05-20 13:50:42 -07:00
Anton Dyudin
9103a1cd06 Update commands.txt
Don't forget to start :bit
2015-05-20 13:23:35 -07:00
Henry Ault
deceedd591 bitcoin instructions 2015-05-20 12:39:14 -07:00
C. Guy Yarvin
b915ade744 Merge branch 'test'
Conflicts:
	urb/urbit.pill
2015-05-20 12:33:34 -07:00
C. Guy Yarvin
08b3e2710c Merge branch 'test'
Conflicts:
	urb/urbit.pill
2015-05-20 12:29:30 -07:00
Anton Dyudin
ac44d6f9d0 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 12:22:52 -07:00
C. Guy Yarvin
fe660a9455 Fix web login address. 2015-05-20 12:04:53 -07:00
C. Guy Yarvin
e221451eb5 Remove printf. 2015-05-20 11:53:07 -07:00
Anton Dyudin
46b5d32e6b Merge branch 'test' into do 2015-05-20 11:46:35 -07:00
Anton Dyudin
345713edac Merge branch 'test' into do
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/  --  took --theirs
	urb/zod/base/fap/talk/core.hook
2015-05-20 11:45:37 -07:00
C. Guy Yarvin
c097c81012 Fix some name issues. 2015-05-20 11:39:27 -07:00
C. Guy Yarvin
d7b7af7ea6 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 21:08:20 -07:00
C. Guy Yarvin
5b16f99726 Latest greatest scriptest. 2015-05-19 21:07:53 -07:00
Anton Dyudin
fe550a766e Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 20:31:32 -07:00