Hi,
..looks like I was caught in the middle of something:
[ 97%] Building CXX object
utils/fgai/CMakeFiles/fgai.dir/HLAAircraftClass.cxx.o
/home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:
In function ‘int main(int, char**)’:
/home/arnt/FG-git/fgfs/flightgear/utils/fgai/fgai.cxx:532
-Original Message-
From: James Turner
Sent: Thursday, February 07, 2013 5:41 PM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] MSVC compile fail with simgear commit
45ae3978f6109d425e17f58eae543543f304ef93
On 7 Feb 2013, at 17:26, Alan Teeder wrote:
> Just a h
Hi Stuart,
one request I would like to place is to automatically spread the checklist over
multiple pages if it gets longer than, say 20 lines. Especially the complex
birds tend to have long checklists ;-)
Cheers,
Gijs
-
On Wed, Jan 30, 2013 at 2:41 PM, James Turner wrote:
>> I'm thinking of combining this with the tutorial system so you can
>> have a virtual co-pilot go through the checklist, calling out the
>> items for you to complete.
>>
>> I'd be interested to hear if those who like flying heavy iron think
>>
On 7 Feb 2013, at 17:26, Alan Teeder wrote:
> Just a heads up I´m afraid.
>
> I haven´t tried to compile the matching Flightgear update.
Yep, unfortunately this is the kind of commit that needs a bit of iteration to
get correct on every platform.
James
---
Just a heads up I´m afraid.
I haven´t tried to compile the matching Flightgear update.
Alan
3> logstream.cxx
3>C:\FlightGear\simgear\simgear\debug\logstream.cxx(99): error C3861:
'AllocConsole': identifier not found
9>-- Build started: Project: openal_test4, Configuration: Release
Win32 -
On 7 Feb 2013, at 10:35, Renk Thorsten wrote:
> I would much appreciate if you could take care of the issue, and also of
Done.
James
--
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before t
> If you want all of them you should be able to cherry-pick the commits _in
> order_ or, alternatively, you could just checkout the final state of the
> files from master as you suggested above.
I can't cherry-pick them no matter what order I try. Basically I want
commit 0b8c17ba7437cb09c40c3754
Renk Thorsten wrote:
> Sorry, I don't want to mess up the release branch, and I would much
> appreciate a helping hand here.
Would you just tell us what commits from master you want in the release
branch? Of course, yes, if the commit you cherry-picked is based on
another one, that won't work wi
On Thu, 7 Feb 2013, Renk Thorsten wrote:
> Okay, as usualy this is not so simple... I get
>
> git cherry-pick dd678c2f8c5613fc600d88fae9faad3a516b5bc0
>
> error: could not apply dd678c2... Bugfix for lower quality water shader in
> Atmospheric Light Scattering
> hint: after resolving the conflict
On 7 Feb 2013, at 10:08, Renk Thorsten wrote:
> I think I understand the problem, because there's a second bugfix having to
> do with water later on the master branch, so presumably if I would have
> pushed the changes to both branches right away it wouldn't have made any
> problems, but I do
> Something along these lines:
>
> $ git branch my-2.10.0 origin/release/2.10.0
>
> $ git checkout my-2.10.0
>
> Find the commit ids of the bug fix commits on the master branch
>
> $ git log master
>
> Cherry pick these to your local release branch
>
> $ git cherry-pick
Okay, as usualy this is n
12 matches
Mail list logo
