| === maxb_ is now known as maxb | ||
| Saviq | bregma, Trevinho, would you please resolve the logic (there is no code one AFAICT) conflict between what landed in unity8 and https://code.launchpad.net/~bregma/unity8/lp-1596069/+merge/298341 wrt MIR_SERVER and stuff | 11:40 |
|---|---|---|
| bregma | you mean, fight it out? | 11:41 |
| Saviq | yes :) | 11:42 |
| === dpm_ is now known as dpm | ||
| === dandrader is now known as dandrader|afk | ||
| === JanC is now known as Guest53913 | ||
| === JanC_ is now known as JanC | ||
| === dandrader|afk is now known as dandrader | ||
| mterry | josharenson1, can you merge trunk into split greeter again? | 14:33 |
| josharenson1 | mterry: sure, can we merge split greeter into trunk instead soon? :-p | 14:33 |
| === josharenson1 is now known as josharenson | ||
| mterry | josharenson1, :) I assume next post-ota silo could include it | 14:33 |
| josharenson | mterry: done, for the sessions-model one too.. no conflicts :-D | 14:45 |
| mterry | josharenson, in sessions-model, a bad merge somewhere dropped the extra-long name for the "long-name" test user | 14:47 |
| josharenson | mterry: ugh, I hope I didn't miss anything else.. I'll take a look | 14:48 |
| Saviq | josharenson, mterry, yeah the next silo should have the split greeter indeed | 14:49 |
| josharenson | yay | 14:49 |
| === dandrader is now known as dandrader|afk | ||
| === dandrader|afk is now known as dandrader | ||
| === dandrader is now known as dandrader|afk | ||
| === dpm is now known as dpm-afk | ||
| === dandrader|afk is now known as dandrader | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!