Merge branch 'test' of https://github.com/urbit/urbit into test

Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-06-03 17:36:45 -04:00
commit 14489860bd

View File

@ -65,14 +65,7 @@ _ames_czar(c3_y imp_y, c3_s* por_s)
c3_c* nam_c = u3r_string(nam); c3_c* nam_c = u3r_string(nam);
c3_c dns_c[64]; c3_c dns_c[64];
// test network snprintf(dns_c, 64, "%s.urbit.org", nam_c + 1);
if ( 0 == imp_y ) {
strcpy(dns_c,"104.236.149.223");
}
else {
snprintf(dns_c, 64, "%s.urbit.org", nam_c + 1);
}
// snprintf(dns_c, 64, "%s.urbit.org", nam_c + 1);
// uL(fprintf(uH, "czar %s, dns %s\n", nam_c, dns_c)); // uL(fprintf(uH, "czar %s, dns %s\n", nam_c, dns_c));
free(nam_c); free(nam_c);