=== jjesse_ is now known as jjesse | ||
=== nUboon2Ag is now known as nUboon2Age | ||
ChrisWoollard | godbyk: Hello | 23:31 |
---|---|---|
ChrisWoollard | How's it going? | 23:31 |
godbyk | Hey, ChrisWoollard | 23:31 |
godbyk | Not too bad. | 23:31 |
ChrisWoollard | Who is Christophe Pfeiffer? | 23:33 |
godbyk | No clue. | 23:34 |
godbyk | I like the change he made, but he's using a newer version of csquotes than I am. And my version doesn't have the polyglossia option yet, so I had to revert his change. | 23:34 |
ChrisWoollard | Just wondered. He is in our commit log for a few minutes ago | 23:34 |
godbyk | Yeah, I saw that. I don't recognize the name. | 23:38 |
dutchie | i thought the changes jenkins made would stop randoms from fiddling | 23:39 |
ChrisWoollard | He did some kind of merge that changed a bucket load of stuff | 23:39 |
godbyk | dutchie: He didn't change the bzr commit access -- only translation stuff, I think. | 23:39 |
godbyk | ChrisWoollard: Well, he apparently committed stuff and then had to merge in all the changes we'd made since he'd started his work. So the big commit is just re-applying the changes we'd made since. | 23:40 |
ChrisWoollard | I hope there are none of those conflicts | 23:41 |
godbyk | I hope so, too. | 23:43 |
ChrisWoollard | I'll grep for them | 23:43 |
godbyk | 'kay. | 23:44 |
ChrisWoollard | looks okay | 23:45 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!