| 00:03.20 | macsforme | pities the unfortunate soul that is the next person to try to merge 2.4 into master |
| 00:04.03 | blast007 | why? |
| 00:04.08 | blast007 | just because lots of changes? |
| 00:04.28 | the_map | One does not simply, merge 2.4 into master |
| 00:05.11 | macsforme | yes, and the IDE files will be quite a task |
| 00:06.16 | blast007 | the mac ones are probably the hardest to merge |
| 00:06.39 | alezakos | I think it's best to take the IDE files from 2.4 and have someone add the new files to them |
| 00:06.49 | macsforme | maybe the unfortunate soul needs to be me, then :P |
| 00:06.57 | macsforme | yes, that would probably be the easiest |
| 00:07.22 | the_map | so...macsforme is having a pity party for himself? |
| 00:07.35 | *** join/#bzflag moriah_ (~quassel@209.222.8.90) |
| 00:07.41 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 00:07.41 | *** mode/#bzflag [+v allejo] by ChanServ |
| 00:07.43 | blast007 | I assume that merging more often be helpful? |
| 00:07.44 | the_map | or are you just planning it right now? |
| 00:07.53 | blast007 | would be* |
| 00:09.40 | alezakos | p.s, that "someone" doesn't have to be one person |
| 00:11.26 | blast007 | after 2.4.4, I'll look into doing the merge, and just copy the 2.4.4 mac files in, then you can look into adding files macsforme |
| 00:15.31 | *** join/#bzflag moriah_ (~quassel@209.222.8.90) |
| 00:15.33 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 00:15.33 | *** mode/#bzflag [+v allejo] by ChanServ |
| 00:45.54 | *** join/#bzflag kierra (~quassel@209.222.8.90) |
| 00:46.07 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 00:46.07 | *** mode/#bzflag [+v allejo] by ChanServ |
| 01:04.13 | *** join/#bzflag moriah (~quassel@209.222.8.90) |
| 01:04.57 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 01:04.57 | *** mode/#bzflag [+v allejo] by ChanServ |
| 01:19.28 | *** join/#bzflag moriah_ (~quassel@209.222.8.90) |
| 01:19.34 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 01:19.34 | *** mode/#bzflag [+v allejo] by ChanServ |
| 01:30.12 | *** join/#bzflag [Gort] (~gort@unaffiliated/gort/x-9231432) |
| 01:30.50 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 01:30.50 | *** mode/#bzflag [+v allejo] by ChanServ |
| 02:04.05 | *** part/#bzflag moriah_ (~quassel@209.222.8.90) |
| 02:33.17 | *** join/#bzflag kierra (~quassel@unaffiliated/kierra) |
| 03:17.16 | *** join/#bzflag Quol (~quassel@modemcable040.174-21-96.mc.videotron.ca) |
| 03:34.02 | *** join/#bzflag Ccb (42577dc0@gateway/web/freenode/ip.66.87.125.192) |
| 03:52.40 | *** join/#bzflag Quol (~quassel@modemcable040.174-21-96.mc.videotron.ca) |
| 04:17.05 | *** join/#bzflag Quol (~quassel@modemcable040.174-21-96.mc.videotron.ca) |
| 05:10.30 | *** join/#bzflag meeba (~lamer@c-73-14-146-7.hsd1.co.comcast.net) |
| 05:10.39 | *** join/#bzflag blast007_ (~blast007@bzflag/developer/Blast) |
| 05:19.40 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 05:36.07 | *** join/#bzflag DTRemenak (~DTRemenak@cpe-172-112-28-185.socal.res.rr.com) |
| 05:36.07 | *** join/#bzflag DTRemenak (~DTRemenak@about/essy/CrazyCoder/DTRemenak) |
| 05:36.07 | *** mode/#bzflag [+v DTRemenak] by ChanServ |
| 11:38.39 | *** join/#bzflag zuii (~cauchy@BC06BF93.catv.pool.telekom.hu) |
| 11:50.08 | blast007 | we still need a name for 2.4.4 ;) |
| 12:05.56 | alezakos | I liked "be my valentank" |
| 12:07.19 | blast007 | :) |
| 13:33.53 | *** join/#bzflag joevano (~joevano@bzflag/developer/JoeVano) |
| 13:33.54 | *** mode/#bzflag [+v joevano] by ChanServ |
| 13:40.01 | macsforme | sounds good to me |
| 13:47.50 | *** join/#bzflag Quol (~quassel@modemcable020.198-23-96.mc.videotron.ca) |
| 14:03.00 | *** part/#bzflag Quol (~quassel@modemcable020.198-23-96.mc.videotron.ca) |
| 14:06.38 | *** join/#bzflag Quol (~quassel@modemcable020.198-23-96.mc.videotron.ca) |
| 14:21.07 | *** join/#bzflag kaadmy (uid135503@gateway/web/irccloud.com/x-gxzhxclmbvamhuoi) |
| 15:21.13 | *** join/#bzflag Quol (~quassel@modemcable020.198-23-96.mc.videotron.ca) |
| 15:29.49 | allejo | No objections here |
| 16:13.40 | *** join/#bzflag kierra (~quassel@209.222.8.90) |
| 16:47.56 | *** join/#bzflag zuii (~cauchy@BC06BF93.catv.pool.telekom.hu) |
| 17:09.39 | *** join/#bzflag ThePurplePanzer (49e3ada1@gateway/web/freenode/ip.73.227.173.161) |
| 17:21.51 | *** part/#bzflag Guest7697 (~quassel@209.222.8.90) |
| 17:23.11 | *** join/#bzflag kierra (~quassel@unaffiliated/kierra) |
| 18:05.12 | *** join/#bzflag quantumdot (~quantum@unaffiliated/quantumdot) |
| 18:18.22 | *** join/#bzflag quantumdot (~quantum@unaffiliated/quantumdot) |
| 19:20.56 | *** join/#bzflag kaadmy (uid135503@gateway/web/irccloud.com/x-jvmsexdbrgefaswk) |
| 19:58.06 | *** join/#bzflag the_map (~the_map@unaffiliated/the-map/x-1795707) |
| 20:37.56 | *** join/#bzflag zuii (~cauchy@BC06BF93.catv.pool.telekom.hu) |
| 20:59.23 | the_map | bzflag: "be my valentank" |
| 20:59.23 | the_map | me: *launches bzflag* |
| 20:59.23 | the_map | computer: *logs out* |
| 20:59.23 | the_map | me, five minutes later: *stares at a recovery screen claiming the filesystem went read-only* |
| 21:02.54 | the_map | I'm fairly certain that the issue is actually that I tried to update my computer... |
| 21:35.50 | *** join/#bzflag Ccb (42577c1a@gateway/web/freenode/ip.66.87.124.26) |
| 21:36.29 | *** join/#bzflag TimRiker (~timr@174-23-163-75.slkc.qwest.net) |
| 21:37.46 | *** join/#bzflag TimRiker (~TimRiker@bzflag/projectlead/TimRiker) |
| 21:37.47 | *** mode/#bzflag [+o TimRiker] by ChanServ |
| 21:37.58 | *** join/#bzflag ccb (uid143832@gateway/web/irccloud.com/x-zyeqcdzprgxfaxlr) |
| 21:39.26 | *** join/#bzflag kierra (~quassel@209.222.8.90) |
| 21:39.50 | *** join/#bzflag allejo (~allejo@unaffiliated/allejo) |
| 21:39.50 | *** mode/#bzflag [+v allejo] by ChanServ |
| 21:50.44 | *** part/#bzflag Guest25458 (~quassel@209.222.8.90) |
| 21:51.39 | *** join/#bzflag moriah (~quassel@unaffiliated/kierra) |