widelands-dev team mailing list archive

[Holger Rapp <HolgerRapp@xxxxxxx>]

get into the habit of merging trunk first thing you set down to work on your branch. That minimizes merge conflicts and makes sure you have the lastest and greatest and make merging back much easier.

On 24.11.2014, at 09:01, Tibor Bamhor <tiborb95@xxxxxxxxx> wrote:

> That's funny, my branch was made from trunk in Friday, must be a day before you fixed it. 
> 
> 2014-11-24 8:51 GMT+01:00 Holger Rapp <HolgerRapp@xxxxxxx>:
> Merge trunk. I fixed this bug two days ago.
> 
> 
> On 24.11.2014, at 08:49, Tibor Bamhor <tiborb95@xxxxxxxxx> wrote:
> 
> > Hi,
> >
> > I am trying to use F6 console, but a lot of things are taking place when typing the commands - game is switching to and form fullscreen, various windows are being opened - it is know issue? Can I at least temporarily disable the shortcuts?
> >
> > Thanks
> > _______________________________________________
> > Mailing list: https://launchpad.net/~widelands-dev
> > Post to     : widelands-dev@xxxxxxxxxxxxxxxxxxx
> > Unsubscribe : https://launchpad.net/~widelands-dev
> > More help   : https://help.launchpad.net/ListHelp
> 
>

Attachment: smime.p7s
Description: S/MIME cryptographic signature