[07:04] good morning [12:03] good morning, dholbach :-) [12:21] hi siretart [13:14] dholbach: Thanks! [13:15] Unit193, anytime [16:23] hey everyone... I am trying to solve a merge conflict which shouldn't happen in the first place - most likely caused through a quilt patch but not sure. However I am fixing the conflict manually push it launchpad and then try to merge it again... still same issues. Not sure what is happening any ideas? Merge request is here: https://code.launchpad.net/~diodon-team/diodon/new-upstream-release-1.2.0/+merge/229496 [17:17] ScottK: could you please upload a new merge of reportbug? it has a critical issue where it crashes whenever it asks for information (see Bug 1358072) [17:17] bug 1358072 in reportbug (Ubuntu) "reportbug crashed with SIGABRT in g_mutex_unlock_slowpath()" [Medium,Confirmed] https://launchpad.net/bugs/1358072 [17:30] Logan: Feel free to merge it if you have time. It'll probably be a few days before I can get to it. [17:30] you don't think that requires an FFe, right? [17:31] actually, nah, it's all bug fixes === wendar_ is now known as wendar [19:06] hello MOTU, LLVM 3.5 now requires you use C++11 when linking against it. due to STL incompat between C++11 and C++98 (e.g. std::pair layout changed), it's not safe to mix code that uses C++11 and C++98. does anyone know how distro maintainers plan to work with this? will everything C++ have to be compiled with -std=c++11 now? === alex-foo is now known as alex-weej