ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-24 23:44:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test'

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Philip C Monk 2015-01-27 00:28:33 -05:00
commit efb39d2b40
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
j/tree.c
View File

@ -487,13 +487,13 @@ static u3j_core _mood_d[] =
{}
};
static u3j_core _k164_d[] =
static u3j_core _k163_d[] =
{ { "mood", 0, _mood_d },
{}
};
static u3j_core _d[] = {
{ "k164", 0, _k164_d},
{ "k163", 0, _k163_d},
{}
};

8
v/sist.c
View File

@ -612,7 +612,7 @@ _sist_zest()
u3_uled led_u;
led_u.mag_l = u3r_mug('g');
led_u.kno_w = 164;
led_u.kno_w = 163;
if ( 0 == u3A->key ) {
led_u.key_l = 0;
@ -871,12 +871,12 @@ _sist_rest()
u3_lo_bail();
}
if ( led_u.kno_w != 164 ) {
if ( led_u.kno_w != 163 ) {
// XX perhaps we should actually do something here
//
uL(fprintf(uH, "rest: (not) translating events (old %d, now %d)\n",
led_u.kno_w,
164));
163));
}
sev_l = led_u.sev_l;
sal_l = led_u.sal_l;
@ -1178,7 +1178,7 @@ _sist_rest()
led_u.sal_l = sal_l;
led_u.sev_l = u3A->sev_l;
led_u.key_l = u3A->key ? u3r_mug(u3A->key) : 0;
led_u.kno_w = 164; // may need actual translation!
led_u.kno_w = 163; // may need actual translation!
led_u.tno_l = 1;
if ( (-1 == lseek64(fid_i, 0, SEEK_SET)) ||