--- Log opened Sun Apr 24 00:00:47 2016
20160424 00:08:58-!- Appleman1234 [~Appleman1@KD036012051159.au-net.ne.jp] has joined #wesnoth-dev
20160424 00:51:01-!- exciton [~exciton@89.208.170.132] has quit [Read error: Connection reset by peer]
20160424 00:51:16-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20160424 01:34:05-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20160424 01:39:07-!- enchi [enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 268 seconds]
20160424 03:35:30-!- yasnothil [yasnothil@2600:3c03::f03c:91ff:fe55:c675] has joined #wesnoth-dev
20160424 03:41:33-!- enchi [enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev
20160424 03:46:09-!- enchi [enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 268 seconds]
20160424 03:53:43< Aginor> celticminstrel: I don't have any opinion for/against it
20160424 03:53:55< Aginor> might be better to ask in the PR so that everyone gets an email
20160424 03:58:16-!- enchi [enchilado@gateway/shell/blinkenshell.org/x-rldflxnatpajjhil] has joined #wesnoth-dev
20160424 04:00:18-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev
20160424 04:19:00-!- enchi [enchilado@gateway/shell/blinkenshell.org/x-rldflxnatpajjhil] has quit [Changing host]
20160424 04:19:00-!- enchi [enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev
20160424 04:19:46-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20160424 04:21:16-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev
20160424 05:27:27-!- enchi [enchilado@defocus/yummy/enchilado] has quit [Ping timeout: 250 seconds]
20160424 05:33:08-!- enchi [enchilado@gateway/shell/blinkenshell.org/x-mcswsizqantsgimo] has joined #wesnoth-dev
20160424 05:54:34-!- EdB [~edb@89.193.129.77.rev.sfr.net] has joined #wesnoth-dev
20160424 05:56:01-!- mjs-de [~mjs-de@p508C8065.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160424 05:56:17-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20160424 05:56:45-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev
20160424 05:57:46-!- enchi [enchilado@gateway/shell/blinkenshell.org/x-mcswsizqantsgimo] has quit [Changing host]
20160424 05:57:46-!- enchi [enchilado@defocus/yummy/enchilado] has joined #wesnoth-dev
20160424 06:07:31-!- mjs-de [~mjs-de@p508C8065.dip0.t-ipconnect.de] has quit [Remote host closed the connection]
20160424 06:46:10-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20160424 07:13:37-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has quit [Quit: And lo! The computer falls into a deep sleep, to awake again some other day!]
20160424 07:32:29-!- Kwandulin [~Miranda@p200300760F3949ACC00F8F5AD2E574E1.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160424 07:44:19-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has joined #wesnoth-dev
20160424 07:49:20-!- mjs-de [~mjs-de@p508C9CD9.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160424 08:00:02-!- exciton [chuck-the-@89.208.170.132] has quit [Read error: Connection reset by peer]
20160424 08:05:16-!- exciton [chuck-the-@89.208.170.132] has joined #wesnoth-dev
20160424 08:48:18-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev
20160424 09:04:55-!- mjs-de [~mjs-de@p508C9CD9.dip0.t-ipconnect.de] has quit [Remote host closed the connection]
20160424 10:04:34-!- EdB [~edb@89.193.129.77.rev.sfr.net] has quit [Quit: Konversation terminated!]
20160424 10:23:33-!- mjs-de [~mjs-de@x4db58835.dyn.telefonica.de] has joined #wesnoth-dev
20160424 10:26:07-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev
20160424 10:29:33-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 240 seconds]
20160424 10:29:34-!- wedge010 is now known as wedge009
20160424 11:06:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160424 11:25:57-!- Kwandulin [~Miranda@p200300760F3949ACC00F8F5AD2E574E1.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160424 11:28:23-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20160424 11:29:32-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160424 11:30:51-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has quit [Quit: off to fly!]
20160424 11:52:14-!- prkc [~prkc@81.17.25.194] has joined #wesnoth-dev
20160424 12:22:04-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Remote host closed the connection]
20160424 12:22:16-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160424 12:26:50-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit]
20160424 12:45:42-!- Kwandulin [~Miranda@2003:76:f39:49ac:79fa:7150:dee5:992f] has joined #wesnoth-dev
20160424 13:12:59< zookeeper> src\utils\context_free_grammar_generator.hpp(37): error C2061: syntax error : identifier 'uint32_t'
20160424 13:13:03< zookeeper> src\utils\context_free_grammar_generator.cpp(131): error C2511: 'std::string context_free_grammar_generator::print_nonterminal(const std::string &,uint32_t *,short) const' : overloaded member function not found in 'context_free_grammar_generator'
20160424 13:16:27-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has joined #wesnoth-dev
20160424 14:13:40-!- yasnothil [yasnothil@2600:3c03::f03c:91ff:fe55:c675] has quit [Quit: ZNC 1.6.1+deb1 - http://znc.in]
20160424 14:22:26-!- yasnothil [yasnothil@2600:3c03::f03c:91ff:fe55:c675] has joined #wesnoth-dev
20160424 14:32:12-!- Kwandulin [~Miranda@2003:76:f39:49ac:79fa:7150:dee5:992f] has quit [Ping timeout: 250 seconds]
20160424 14:58:42-!- Kwandulin [~Miranda@p200300760F3949BA79FA7150DEE5992F.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160424 15:00:56-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160424 15:17:32-!- ancestral [~ancestral@75-168-27-21.mpls.qwest.net] has quit [Quit: i go nstuf kthxbai]
20160424 15:44:08-!- Duthlet [~Duthlet@p5485EFBD.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160424 15:46:47-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20160424 15:49:30-!- onkruid [51f2216c@gateway/web/freenode/ip.81.242.33.108] has joined #wesnoth-dev
20160424 15:50:56-!- onkruid [51f2216c@gateway/web/freenode/ip.81.242.33.108] has quit [Client Quit]
20160424 15:59:04-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20160424 16:08:54-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20160424 16:09:00-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20160424 16:09:08-!- prkc [~prkc@81.17.25.194] has quit [Ping timeout: 276 seconds]
20160424 16:23:48-!- prkc [~prkc@catv-89-133-36-138.catv.broadband.hu] has joined #wesnoth-dev
20160424 16:32:38-!- aidanhs [~aidanhs@81.4.110.234] has quit [Quit: leaving]
20160424 16:57:29-!- aidanhs [~aidanhs@2a00:d880:6:1ad::8e27] has joined #wesnoth-dev
20160424 17:05:57-!- aidanhs [~aidanhs@2a00:d880:6:1ad::8e27] has quit [Quit: WeeChat 0.4.2]
20160424 17:06:08-!- aidanhs [~aidanhs@2a00:d880:6:1ad::8e27] has joined #wesnoth-dev
20160424 17:18:02-!- celticminstrel [~celmin@unaffiliated/celticminstrel] has joined #wesnoth-dev
20160424 17:42:26-!- Kwandulin [~Miranda@p200300760F3949BA79FA7150DEE5992F.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160424 18:09:07-!- Kwandulin [~Miranda@p200300760F3949BAE5B2AA917297B360.dip0.t-ipconnect.de] has joined #wesnoth-dev
20160424 18:45:39-!- prkc [~prkc@catv-89-133-36-138.catv.broadband.hu] has quit [Remote host closed the connection]
20160424 19:01:41-!- irker269 [~irker@uruz.ai0867.net] has joined #wesnoth-dev
20160424 19:01:41< irker269> wesnoth: ln-zookeeper wesnoth:master c4d2e72a1288 / data/core/units/monsters/ (6 files): Updates to monster unit descriptions https://github.com/wesnoth/wesnoth/commit/c4d2e72a12880366613c426c6415f5d6b5242831
20160424 19:11:30< celticminstrel> Any particular reason for doing those ones and not the others from that thread?
20160424 19:12:10< zookeeper> yeah: i'm doing it in pieces, not all 50 or however many there are at once :p
20160424 19:12:15< celticminstrel> Ah, okay.
20160424 19:32:39-!- travis-ci [~travis-ci@ec2-54-162-157-32.compute-1.amazonaws.com] has joined #wesnoth-dev
20160424 19:32:40< travis-ci> wesnoth/wesnoth#9323 (master - c4d2e72 : ln-zookeeper): The build was broken.
20160424 19:32:40< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/125417196
20160424 19:32:40-!- travis-ci [~travis-ci@ec2-54-162-157-32.compute-1.amazonaws.com] has left #wesnoth-dev []
20160424 19:42:37-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20160424 19:42:43-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20160424 19:49:30-!- vultraz_iOS [uid24821@wesnoth/developer/vultraz] has joined #wesnoth-dev
20160424 19:56:49< zookeeper> celticminstrel, you wouldn't happen to know how to fix the VS compilation error i pasted earlier?
20160424 19:57:15-!- Kwandulin [~Miranda@p200300760F3949BAE5B2AA917297B360.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer]
20160424 19:58:19< zookeeper> src\utils\context_free_grammar_generator.hpp(37): error C2061: syntax error : identifier 'uint32_t'
20160424 19:58:19< zookeeper> src\utils\context_free_grammar_generator.cpp(131): error C2511: 'std::string context_free_grammar_generator::print_nonterminal(const std::string &,uint32_t *,short) const' : overloaded member function not found in 'context_free_grammar_generator'
20160424 19:58:34< zookeeper> maybe relevant: http://stackoverflow.com/questions/5162784/uint32-t-identifier-not-found-error
20160424 20:01:58< celticminstrel> Oh.
20160424 20:02:26< zookeeper> i'd complain to dugi directly if he was around, but...
20160424 20:02:59< celticminstrel> Well, simply changing it to int should probably work...
20160424 20:03:35< celticminstrel> I'm not quite sure if he's relying on it being exactly 32 bits, but I think that's the seeds for the random number generator, so probably not.
20160424 20:20:11< zookeeper> yeah i guess i can locally try changing it to int
20160424 20:21:28< celticminstrel> Oh wait, unsigned is probably better, I guess.
20160424 20:22:12< zookeeper> Uint32 is used a lot in the code, any reason for that one to be whatever uint32_t is supposed to be?
20160424 20:22:27< celticminstrel> I think Uint32 is defined by SDL.
20160424 20:22:33< celticminstrel> uint32_t is defined by C++11.
20160424 20:22:59< celticminstrel> I'm not quite sure whether the problem in MSVC12 is that the header for that is not included or that it's not available.
20160424 20:24:20-!- gfgtdf [~chatzilla@x4e3637c6.dyn.telefonica.de] has joined #wesnoth-dev
20160424 20:24:34< gfgtdf> zookeeper:  think you canjust include that header
20160424 20:24:54< gfgtdf> zookeeper: #include <cstdint> at the top og that file that is
20160424 20:26:19< zookeeper> right, that seems to work too
20160424 20:26:29< gfgtdf> zookeeper: as celticminstrel said Uint32 is defined by SDL so i wouldn't use it in code parts that are completleey unrelatd to sdl
20160424 20:26:36< celticminstrel> Yeah.
20160424 20:26:39< zookeeper> okay
20160424 20:27:22< zookeeper> great, thanks
20160424 20:39:20-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has joined #wesnoth-dev
20160424 21:01:32-!- Dugi [93fbd396@gateway/web/freenode/ip.147.251.211.150] has joined #wesnoth-dev
20160424 21:01:34< Dugi> Hello.
20160424 21:01:36< Dugi> I have a question. I wanted to update my local wesnoth repo, I used 'git pull origin master', but it lists a load of bogus changes I haven't done. It tells me to stash them or commit them, but when I try to do any, it tells that I have done no changes (which is correct). How do I force update the repo?
20160424 21:03:06< celticminstrel> To force update and discard all local changes:
20160424 21:03:08-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20160424 21:03:28< celticminstrel> git fetch <upstream> master && git reset --hard <upstream>/master
20160424 21:03:39< celticminstrel> Where <upstream> is the name you've given to the remote.
20160424 21:04:12< celticminstrel> Actually, probably better to use FETCH_HEAD instead of <upstream>/master
20160424 21:04:23< celticminstrel> Then it'll work even if you haven't named the remote and are using a URL.
20160424 21:10:28< Dugi> What does that <upstream> thing mean?
20160424 21:11:02-!- horrowind [~Icedove@2a02:810a:83c0:1c18:21b:fcff:fee3:c3ff] has joined #wesnoth-dev
20160424 21:13:39< celticminstrel> I just said that...
20160424 21:16:31-!- skyfaller [~skyfaller@wikipedia/Skyfaller] has joined #wesnoth-dev
20160424 21:17:38< Dugi> Ah yes, I have misread. Got it working.
20160424 21:26:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!]
20160424 21:27:55-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev
20160424 21:31:12-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
20160424 21:31:40< irker269> wesnoth: ln-zookeeper wesnoth:master 694fb9d36ecd / data/core/units/monsters/Sea_Serpent.cfg: Fixed issues with Sea Serpent description pointed out by beetlenaut https://github.com/wesnoth/wesnoth/commit/694fb9d36ecd5ff472797430238313843de1661f
20160424 21:35:49-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 252 seconds]
20160424 21:50:47-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20160424 21:57:24-!- vultraz_iOS [uid24821@wesnoth/developer/vultraz] has quit [Quit: Connection closed for inactivity]
20160424 22:06:32-!- travis-ci [~travis-ci@ec2-54-162-157-32.compute-1.amazonaws.com] has joined #wesnoth-dev
20160424 22:06:33< travis-ci> wesnoth/wesnoth#9324 (master - 694fb9d : ln-zookeeper): The build has errored.
20160424 22:06:34< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/125437906
20160424 22:06:34-!- travis-ci [~travis-ci@ec2-54-162-157-32.compute-1.amazonaws.com] has left #wesnoth-dev []
20160424 22:26:09-!- wedge010 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has joined #wesnoth-dev
20160424 22:29:06-!- wedge009 [~Thunderbi@60-241-236-92.static.tpgi.com.au] has quit [Ping timeout: 268 seconds]
20160424 22:29:06-!- wedge010 is now known as wedge009
20160424 22:30:34-!- ChipmunkV [~vova@d0017-2-88-172-31-68.fbx.proxad.net] has quit [Quit: ChipmunkV]
20160424 22:35:19-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20160424 22:37:25-!- {V} [~V@105-70-ftth.on.nl] has quit [Ping timeout: 252 seconds]
20160424 22:37:35-!- Dugi [93fbd396@gateway/web/freenode/ip.147.251.211.150] has quit []
20160424 22:37:37-!- {V} [~V@105-70-ftth.on.nl] has joined #wesnoth-dev
20160424 22:41:30-!- Duthlet [~Duthlet@p5485EFBD.dip0.t-ipconnect.de] has quit [Quit: leaving]
20160424 22:49:31-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection]
20160424 22:49:38-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev
20160424 22:49:40-!- Appleman1234 [~Appleman1@KD036012051159.au-net.ne.jp] has quit [Ping timeout: 250 seconds]
20160424 22:56:09-!- Appleman1234 [~Appleman1@KD036012037207.au-net.ne.jp] has joined #wesnoth-dev
20160424 22:57:53-!- noy [~Noy@wesnoth/developer/noy] has joined #wesnoth-dev
20160424 23:21:45-!- noy [~Noy@wesnoth/developer/noy] has quit [Quit: noy]
20160424 23:24:46-!- mjs-de [~mjs-de@x4db58835.dyn.telefonica.de] has quit [Remote host closed the connection]
20160424 23:32:33-!- ancestral [~ancestral@63.92.240.233] has joined #wesnoth-dev
20160424 23:34:04-!- horrowind [~Icedove@2a02:810a:83c0:1c18:21b:fcff:fee3:c3ff] has quit [Quit: horrowind]
20160424 23:43:45-!- ToBeCloud [uid51591@wikimedia/ToBeFree] has quit [Quit: Connection closed for inactivity]
20160424 23:45:53-!- ancestral [~ancestral@63.92.240.233] has quit [Quit: i go nstuf kthxbai]
--- Log closed Mon Apr 25 00:00:06 2016