| === j1mc_ is now known as j1mc | ||
| nhandler | mdke: I noticed that merge issue shortly after requesting it (however, I was unable to add a comment at the time). However, the patch has been attached to the bug for a few days. In order to ensure it gets pushed to the karmic branch, I'll fix up my person branch so it is mergable | 22:25 |
|---|---|---|
| mdke | nhandler: oh, sorry. Don't worry about the branch then, no point with the extra work | 22:27 |
| mdke | nhandler: I'll grab the patch now | 22:27 |
| nhandler | Thanks a lot mdke :) | 22:27 |
| mdke | nhandler: ok, it looks good to me. I'll let upstream check the terminology though, no doubt it will enter Ubuntu when we merge from upstream during the karmic cycle | 22:29 |
| mdke | nhandler: I'll comment on the upstream bug | 22:29 |
| nhandler | mdke: Just out of curiosity, how do we handle the merge with upstream? Do we just merge the branches? | 22:31 |
| mdke | nhandler: yes, there tend to be quite a few conflicts to sort out (po files are terrible with vcs) but it's a decent solution | 22:31 |
| Rocket2DMn | mdke, i saw your response to matt lye's email this morning, I don't know exactly why he contacted anybody directly rather than mailing lists, but there seems to be some confusion over what we are doing | 23:02 |
| Rocket2DMn | our Education focus group is coordinating with #ubuntu-classroom sessions | 23:03 |
| Rocket2DMn | I believe you know cprofitt, he is leading that up, I think he has been coordinating with Elizabeth Krumbach (pleia2 on irc) | 23:03 |
| Rocket2DMn | I'm not sure why Matt (Vantrax on IRC) got ahold of you to ask those questions | 23:04 |
| mdke | Rocket2DMn: he mailed the entire ~ubuntumembers group on Launchpad. But I'm happy if you clarify his email on the list, I'm just going off to bed now | 23:04 |
| Rocket2DMn | Did he really? I wasnt contacted directly... | 23:05 |
| Rocket2DMn | Ok, go ahead and go to bed, I'll talk with you more later, gnight | 23:05 |
| mdke | This message was sent from Launchpad by the user | 23:07 |
| mdke | Matthew Lye (https://launchpad.net/~matthew.lye) | 23:07 |
| mdke | using the "Contact this team" link on the Ubuntu Members | 23:07 |
| mdke | team page to each member directly. | 23:07 |
| Rocket2DMn | oh youre right, i do see it now | 23:07 |
| Rocket2DMn | how embarrassing | 23:07 |
| mdke | :D | 23:08 |
| mdke | ok, good night | 23:08 |
| Rocket2DMn | ok thanks, i'll email the list after i am able to contact him | 23:08 |
| Rocket2DMn | peace | 23:08 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!