| hatch | rick_h, I forgot to mention in my reply - you will probably want to merge trunk in too as there are some changes that will probably cause conflicts | 01:10 |
|---|---|---|
| rick_h | hatch: will do | 01:10 |
| rick_h | hatch: I didn't call it viewlet-manager beccause it had ViewletBase in it as well | 01:10 |
| hatch | yeah I figured that - although viewlet base is a private var | 01:11 |
| hatch | well was | 01:11 |
| hatch | heh | 01:11 |
| hatch | :) | 01:11 |
| hatch | it's part of the manager | 01:11 |
| rick_h | hatch: yea, gotcha. Thanks for looking it over. I'll update and merge trunk and see how it goes. | 01:12 |
| hatch | np - I don't really have it in me to do a proper QA tonight so I'll get to it after the next update tomorrow/whenever you get the new version up :) | 01:12 |
| rick_h | hatch: yea, with it private I'll change that over. | 01:12 |
| rick_h | hatch: yea, no hurry. I just wanted to finish up what I had started while I had the list of what was going on in my head | 01:12 |
| rick_h | lots of places to touch and dind't want to want over the weekend to complete. I'd have messed it up for sure | 01:13 |
| hatch | yeah - should try and get it landed as soon as possible though so that it doesn't diff to far from trunk | 01:13 |
| rick_h | yea, very true | 01:13 |
| hatch | don't want to cause you any more issues haha | 01:13 |
| rick_h | I'll have the update before everyone gets going Monday and try to push for reviews first thing in the morning. | 01:13 |
| hatch | sounds great | 01:18 |
| rick_h | hatch: woot, sync with trunk wasn't horrible. Yay! | 01:45 |
| hatch | awesome! | 01:46 |
| rick_h | 3 conflicts, but easy to sync up | 01:46 |
| rick_h | oooh, just remembered I brought my cupcake back to the room! | 01:57 |
| hatch | haha | 01:58 |
| rick_h | abentley: safe plane ride? | 15:39 |
| abentley | rick_h: We landed in one piece, but there was lightning and turbulence. | 15:43 |
| rick_h | wheeee | 15:44 |
| rick_h | at least you weren't on a Six Flags roller coaster | 15:44 |
| abentley | True. Are you headed home, or already there? | 15:46 |
| rick_h | waiting at the gate | 15:47 |
| abentley | Safe flight! | 15:47 |
| rick_h | thanks | 15:48 |
| === marcoceppi_ is now known as marcoceppi | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!