| <- Previous Log | Select Different Log | Next Log -> |
Log from 2019-01-01: [05:56:21] *** Joins: physkets_ (~physkets@unaffiliated/physkets) [05:59:46] *** Quits: physkets (~physkets@unaffiliated/physkets) (Ping timeout: 268 seconds) [08:08:58] *** Quits: physkets_ (~physkets@unaffiliated/physkets) (Read error: Connection reset by peer) [08:17:29] *** Joins: physkets_ (~physkets@unaffiliated/physkets) [09:08:44] *** Quits: physkets_ (~physkets@unaffiliated/physkets) (Quit: physkets_) [10:28:15] *** Joins: physkets (~physkets@unaffiliated/physkets) [14:37:22] *** Quits: physkets (~physkets@unaffiliated/physkets) (Quit: physkets) [17:30:17] <Z-Man> ct|kyle: the sdl2 branch is already merged. The two -ct branches give conflicts on merge with 0.4-armagetronad-work I don't feel confident resolving right now, maybe you want to update them to current 0.4-armagetronad-work first? [17:30:41] <Z-Man> The other two are being processed and looking good, I'll post the links when they're done. [17:31:45] <Z-Man> -ct-ladderlog looks doable for me, I'll just have to investigate the source of each side of the conflicts. They're not too many. [17:32:48] <Z-Man> But -ct has 97 in a screen full of text files, I'm not daring to look at the details. [17:35:30] <Z-Man> Ah, here's the first one: lp:~z-man/armagetronad/0.4-armagetronad-v2sty-unified [17:37:37] <Z-Man> All the v2sty code is in the one merge commit, of course with full history, just not visible in the web UI. [17:38:13] <Z-Man> And the other one: lp:~z-man/armagetronad/0.4-armagetronad-delaycmd-unified [17:42:18] <Z-Man> That one wasn't really worth the full transformation :) [17:43:06] <Z-Man> I should probably check whether I can do anything for the cmake and fortress-ai branches. [17:47:37] <ljrbot> New news from bzr: [armagetronad-unification-scripts] r30 Missed that edit.... || [armagetronad-unification-scripts] r29 Try ~z-man's -unified module as canonical source of already ... || [0.4-armagetronad-delaycmd-unified] r3080 Merge from lp:~armagetronad-ct/armagetronad/0.4-delaycmd || [armagetronad-unification-scripts] r28 Added repair_hack*.sh that can be used to lift branches base... || [0.4-armagetronad-v2sty-unified] r3080 Mer [18:22:55] <ct|kyle> Z-Man: thanks, what do I need to do to be able to merge it then? that was part of the issue I had bzr kept giving me errors when I tried to merge them [21:27:44] *** Joins: Z-Man- (~Z-Man@p5B32624F.dip0.t-ipconnect.de) [21:27:44] *** Quits: Z-Man (~Z-Man@p4FE3EFB9.dip0.t-ipconnect.de) (Killed (hitchcock.freenode.net (Nickname regained by services))) [21:27:44] *** Z-Man- is now known as Z-Man [23:24:55] *** Joins: physkets (~physkets@unaffiliated/physkets)View entire month
is a site that has tools, maps, and other various items. It orignally only existed as a server control panel, but I slowly began adding stuff such as a homepage and tools.
Gridder
.