Re: [Flightgear-devel] Procedural texturing merge request

2012-08-08 Thread Renk Thorsten
 Do I want atmospheric scattering on or off?  That affects which are the  
 top two sliders.

You want atmospheric scattering on. Then the top sliders are 'Landmass' and 
'Transition'. These you want at 5. 

What did it take to make the correct dialog appear? Are you sure you have the 
updated effects and shader code? For instance, terrain-default.eff should 
contain the new texture declarations with indices 11 and 12 in the initial 
parameter section. Is that the case in your file?

texture n=11
imageTextures/Terrain/void.png/image
filterlinear-mipmap-linear/filter
wrap-srepeat/wrap-s
wrap-trepeat/wrap-t
internal-formatnormalized/internal-format
/texture
texture n=12
imageTextures/Terrain/void.png/image
filterlinear-mipmap-linear/filter
wrap-srepeat/wrap-s
wrap-trepeat/wrap-t
internal-formatnormalized/internal-format
/texture

But I'm not seeing anything different in the ground textures.  Or do I need to 
have some 
 sort of custom scenery installed that references the new material definitions?

No, the overlay textures are declared in the materials file, no custom scenery 
required. For instance, ShrubCover in summer should contain a block

 texture-set
   textureTerrain/shrub1.png/texture
   texture n=11Terrain/grass_hires.png/texture
   texture n=12Terrain/dirtrock.png/texture
  /texture-set

which defines the overlay textures in addition to the base texture. So this 
works in default scenery. 

You would notice when it's on - the result looks very different from the base 
texture alone.

* Thorsten
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] [SFD] http://flightgear.org/about/ text license?

2012-08-08 Thread Ivan Shmakov
 Arnt Karlsen a...@c2i.net writes:
 On Mon, 06 Aug 2012 10:33:19 +0700, Ivan wrote:

[…]

  Here in Russia, a few teams have decided that we may benefit from
  including short notes on various free software packages into our
  “Join us on SFD 2012!” flyers, and FlightGear was one of such
  packages (along with Firefox, VLC, and a few more.  Check, e. g.,
  [1]; though the discussion is obviously in Russian.)

  ..going there with the Chromium browser, translation is
  semi-automatic, just click the button in the drop-down translation
  menu bar.  Other browsers may have to use
  e. g. http://translate.google.com/.

I'm glad it works for you (personally, I haven't managed to get
any use of machine translation), but it doesn't quite answer my
question, which is: are the FlightGear project's Web pages free
(as in freedom)?  More specifically, can we use a fragment of
the Introduction [2] page as the basis for our note about
FlightGear?

TIA.

[…]

  Our author has translated a paragraph or so of the Introduction [2]
  page into Russian to use it as the basis for such a note, only to
  discover later that there's no statement allowing for such a use on
  that page.

[…]

  [1] http://comments.gmane.org/gmane.user-groups.foss.sfd.planning.ru/47
  [2] http://flightgear.org/about/

-- 
FSF associate member #7257  http://sf-day.org/


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


[Flightgear-devel] git help request

2012-08-08 Thread Curtis Olson
I've run into a problem with git and I seem to hit a dead end no matter
which way I turn.  I'm hoping this is something easy to solve, but the
details might be complicated to communicate?  I'll try to start simple --
I'm working with the fgdata repository.  I created my own branch and have
been tracking some experimental stuff there.  This has been working well
and when I do a git pull I will checkout my local branch and merge with
the master to make sure everything is tracking well and stays compatible.

With my most recent attempt to merge my local branch with master I got an
error (unfortunately now I do not remember what the exact error was, and I
had to do a reboot for other reasons in the mean time.)  My first thought
after getting an error trying to merge was maybe I should rebase since I've
just been merging all along.

So I ran git rebase and that ran did a lot of work, but then generated
some error messages about whitespace, and then displayed some message that
it had to fall back to a 3-way diff.  That ran and ran for quite some time
and (I think?) errored out.  Again, I don't have the message any more. :-(

Now after my reboot, I'm trying to figure out what's going on.  If I run
git branch I get:

$ git branch
* (no branch)

If I try to checkout any branch I get a list of files that need merge and
then the message: error: you need to resolve your current index first.

If I git add any of these files, what branch am I adding them to and
merging them into?  (no branch)?

It seems like all the git help I can find for these error messages presumes
I can checkout a branch -- but I can't.  Any suggestions?

Thanks,

Curt.
-- 
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread M. Carbax
Hi Alan:

Once more, thanks for trying to help, but there is no way: I tried SG
$ FG 2.9.0, I followed the document, but the errors still appear: I
give up :(

I think that 10 days is enough.

Thanks,

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread Frederic Bouvier
 
 Hi Alan:
 
 Once more, thanks for trying to help, but there is no way: I tried SG
 $ FG 2.9.0, I followed the document, but the errors still appear: I
 give up :(
 
 I think that 10 days is enough.

You have 2.8.0 rc4 if you can't wait

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread M. Carbax
Thanks Frederic:

I tryed before 2.8.0 and 2.6.0, and the problem is the same: smething
realted with simgear lib and unresolved external symbols.


I don't know what I'm doing wrong,  thanks,


2012/8/8 Frederic Bouvier fredfgf...@free.fr:

 Hi Alan:

 Once more, thanks for trying to help, but there is no way: I tried SG
 $ FG 2.9.0, I followed the document, but the errors still appear: I
 give up :(

 I think that 10 days is enough.

 You have 2.8.0 rc4 if you can't wait

 --
 Live Security Virtual Conference
 Exclusive live event will cover all the ways today's security and
 threat landscape has changed and how IT managers can respond. Discussions
 will include endpoint security, mobile security and the latest in malware
 threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
 ___
 Flightgear-devel mailing list
 Flightgear-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/flightgear-devel

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread Frederic Bouvier
I mean: 2.8.0 rc4 *binaries* are out.
I doubt that you manage to compile from sources 2.8 if you can't for 2.9

Regards,
-Fred

- Mail original -
 De: M. Carbax mcar...@gmail.com
 À: FlightGear developers discussions 
 flightgear-devel@lists.sourceforge.net
 Envoyé: Mercredi 8 Août 2012 17:17:26
 Objet: Re: [Flightgear-devel] Error building FG on Windows (linking)
 
 Thanks Frederic:
 
 I tryed before 2.8.0 and 2.6.0, and the problem is the same: smething
 realted with simgear lib and unresolved external symbols.
 
 
 I don't know what I'm doing wrong,  thanks,
 
 
 2012/8/8 Frederic Bouvier fredfgf...@free.fr:
 
  Hi Alan:
 
  Once more, thanks for trying to help, but there is no way: I tried
  SG
  $ FG 2.9.0, I followed the document, but the errors still appear:
  I
  give up :(
 
  I think that 10 days is enough.
 
  You have 2.8.0 rc4 if you can't wait
 
  --
  Live Security Virtual Conference
  Exclusive live event will cover all the ways today's security and
  threat landscape has changed and how IT managers can respond.
  Discussions
  will include endpoint security, mobile security and the latest in
  malware
  threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
  ___
  Flightgear-devel mailing list
  Flightgear-devel@lists.sourceforge.net
  https://lists.sourceforge.net/lists/listinfo/flightgear-devel
 
 --
 Live Security Virtual Conference
 Exclusive live event will cover all the ways today's security and
 threat landscape has changed and how IT managers can respond.
 Discussions
 will include endpoint security, mobile security and the latest in
 malware
 threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
 ___
 Flightgear-devel mailing list
 Flightgear-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/flightgear-devel
 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread Alan Teeder
It may be an OSG library error. If you already have OSG installed on your 
computer Cmake may be detecting this instead of the one that you think that 
you are using if you are following the instructions at 
http://wiki.flightgear.org/Building_using_CMake_-_Windows.

Look at the Cmake  screen after pressing configure.

Have you tried the pre-built binaries at 
http://www.flightgear.org/download/main-program/ and 
http://wiki.flightgear.org/FlightGear_Build_Server?

When you come to run the program also be aware that fgdata version has to 
match the flightgear version., and downloading fgdata takes a long long long 
time. (My Git copy of fgdata is 15Gb at the moment!)

Best of luck.



-Original Message- 
From: M. Carbax
Sent: Wednesday, August 08, 2012 4:17 PM
To: FlightGear developers discussions
Subject: Re: [Flightgear-devel] Error building FG on Windows (linking)

Thanks Frederic:

I tryed before 2.8.0 and 2.6.0, and the problem is the same: smething
realted with simgear lib and unresolved external symbols.


I don't know what I'm doing wrong,  thanks,


2012/8/8 Frederic Bouvier fredfgf...@free.fr:

 Hi Alan:

 Once more, thanks for trying to help, but there is no way: I tried SG
 $ FG 2.9.0, I followed the document, but the errors still appear: I
 give up :(

 I think that 10 days is enough.

 You have 2.8.0 rc4 if you can't wait

 --
 Live Security Virtual Conference
 Exclusive live event will cover all the ways today's security and
 threat landscape has changed and how IT managers can respond. Discussions
 will include endpoint security, mobile security and the latest in malware
 threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
 ___
 Flightgear-devel mailing list
 Flightgear-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/flightgear-devel

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel 


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] git help request

2012-08-08 Thread Curtis Olson
A quick update here.  Rob pointed out the git rebase --abort command
which got me back to a sensible working state.  I was able to reevaluate my
original problem which turned out to be a simple merge conflict in my
branch vs. changes in master and I was able to fix that and successfully
merge -- so I'm in a reasonable working state again.

But I would mind rebasing my local changes, but I still get an error.

I think what happened originally is I changed the directory name of my
aircraft from Malolo1 to Resolution, then thought for a second and changed
it again to ATI-Resolution -- and then did that all as a single commit.
 Now the rebase throws fits on that patch.

It complains about whitespace errors, then falls back to a 3-way merge,
then reports conflicts with all the files in the 2 old directories, for
example:

Aircraft/Malolo1/Engines/18x8.xml: needs merge
Aircraft/Resolution/Engines/18x8.xml: needs merge

The typical fix is to edit the conflicting files and git add them the run
git rebase --continue.  But these files don't exist so I can't edit them,
git add fails, git rm also fails since they don't exist.

I suppose I could abandon this branch, figure out the diffs against
master manually, create a new branch, and copy those diffs into my new
branch -- but then I would lose all my history and that just doesn't seem
very git-ish -- I hate to go against the spirit of git which is more
along the lines of performing brain surgery on myself when I don't quite
feel happy -- what could go wrong?  Or what do I do when something goes
wrong? :-)

Curt.


On Wed, Aug 8, 2012 at 9:27 AM, Curtis Olson curtol...@gmail.com wrote:

 I've run into a problem with git and I seem to hit a dead end no matter
 which way I turn.  I'm hoping this is something easy to solve, but the
 details might be complicated to communicate?  I'll try to start simple --
 I'm working with the fgdata repository.  I created my own branch and have
 been tracking some experimental stuff there.  This has been working well
 and when I do a git pull I will checkout my local branch and merge with
 the master to make sure everything is tracking well and stays compatible.

 With my most recent attempt to merge my local branch with master I got an
 error (unfortunately now I do not remember what the exact error was, and I
 had to do a reboot for other reasons in the mean time.)  My first thought
 after getting an error trying to merge was maybe I should rebase since I've
 just been merging all along.

 So I ran git rebase and that ran did a lot of work, but then generated
 some error messages about whitespace, and then displayed some message that
 it had to fall back to a 3-way diff.  That ran and ran for quite some time
 and (I think?) errored out.  Again, I don't have the message any more. :-(

 Now after my reboot, I'm trying to figure out what's going on.  If I run
 git branch I get:

 $ git branch
 * (no branch)

 If I try to checkout any branch I get a list of files that need merge and
 then the message: error: you need to resolve your current index first.

 If I git add any of these files, what branch am I adding them to and
 merging them into?  (no branch)?

 It seems like all the git help I can find for these error messages
 presumes I can checkout a branch -- but I can't.  Any suggestions?

 Thanks,

 Curt.
 --
 Curtis Olson:
 http://www.atiak.com - http://aem.umn.edu/~uav/
 http://www.flightgear.org - http://gallinazo.flightgear.org




-- 
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] git help request

2012-08-08 Thread Curtis Olson
On Wed, Aug 8, 2012 at 10:45 AM, Curtis Olson curtol...@gmail.com wrote:

 A quick update here.  Rob pointed out the git rebase --abort command
 which got me back to a sensible working state.  I was able to reevaluate my
 original problem which turned out to be a simple merge conflict in my
 branch vs. changes in master and I was able to fix that and successfully
 merge -- so I'm in a reasonable working state again.

 But I would mind rebasing my local changes, but I still get an error.

 I think what happened originally is I changed the directory name of my
 aircraft from Malolo1 to Resolution, then thought for a second and changed
 it again to ATI-Resolution -- and then did that all as a single commit.
  Now the rebase throws fits on that patch.

 It complains about whitespace errors, then falls back to a 3-way merge,
 then reports conflicts with all the files in the 2 old directories, for
 example:

 Aircraft/Malolo1/Engines/18x8.xml: needs merge
 Aircraft/Resolution/Engines/18x8.xml: needs merge

 The typical fix is to edit the conflicting files and git add them the
 run git rebase --continue.  But these files don't exist so I can't edit
 them, git add fails, git rm also fails since they don't exist.

 I suppose I could abandon this branch, figure out the diffs against
 master manually, create a new branch, and copy those diffs into my new
 branch -- but then I would lose all my history and that just doesn't seem
 very git-ish -- I hate to go against the spirit of git which is more
 along the lines of performing brain surgery on myself when I don't quite
 feel happy -- what could go wrong?  Or what do I do when something goes
 wrong? :-)


brain surgery --abort :-)

Curt.
-- 
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread M. Carbax
Thanks Fred, I'll try my last chance :(

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] git help request

2012-08-08 Thread Tim Moore
It sounds like your local tree has not been completely committed. See
what git status says. Check out the man page for git-mv. I can't say
more right at the moment, but I'll see if I can add more details
later.

Tim

On Wed, Aug 8, 2012 at 5:45 PM, Curtis Olson curtol...@gmail.com wrote:
 A quick update here.  Rob pointed out the git rebase --abort command which
 got me back to a sensible working state.  I was able to reevaluate my
 original problem which turned out to be a simple merge conflict in my branch
 vs. changes in master and I was able to fix that and successfully merge --
 so I'm in a reasonable working state again.

 But I would mind rebasing my local changes, but I still get an error.

 I think what happened originally is I changed the directory name of my
 aircraft from Malolo1 to Resolution, then thought for a second and changed
 it again to ATI-Resolution -- and then did that all as a single commit.  Now
 the rebase throws fits on that patch.

 It complains about whitespace errors, then falls back to a 3-way merge, then
 reports conflicts with all the files in the 2 old directories, for example:

 Aircraft/Malolo1/Engines/18x8.xml: needs merge
 Aircraft/Resolution/Engines/18x8.xml: needs merge

 The typical fix is to edit the conflicting files and git add them the run
 git rebase --continue.  But these files don't exist so I can't edit them,
 git add fails, git rm also fails since they don't exist.

 I suppose I could abandon this branch, figure out the diffs against master
 manually, create a new branch, and copy those diffs into my new branch --
 but then I would lose all my history and that just doesn't seem very git-ish
 -- I hate to go against the spirit of git which is more along the lines of
 performing brain surgery on myself when I don't quite feel happy -- what
 could go wrong?  Or what do I do when something goes wrong? :-)

 Curt.


 On Wed, Aug 8, 2012 at 9:27 AM, Curtis Olson curtol...@gmail.com wrote:

 I've run into a problem with git and I seem to hit a dead end no matter
 which way I turn.  I'm hoping this is something easy to solve, but the
 details might be complicated to communicate?  I'll try to start simple --
 I'm working with the fgdata repository.  I created my own branch and have
 been tracking some experimental stuff there.  This has been working well and
 when I do a git pull I will checkout my local branch and merge with the
 master to make sure everything is tracking well and stays compatible.

 With my most recent attempt to merge my local branch with master I got an
 error (unfortunately now I do not remember what the exact error was, and I
 had to do a reboot for other reasons in the mean time.)  My first thought
 after getting an error trying to merge was maybe I should rebase since I've
 just been merging all along.

 So I ran git rebase and that ran did a lot of work, but then generated
 some error messages about whitespace, and then displayed some message that
 it had to fall back to a 3-way diff.  That ran and ran for quite some time
 and (I think?) errored out.  Again, I don't have the message any more. :-(

 Now after my reboot, I'm trying to figure out what's going on.  If I run
 git branch I get:

 $ git branch
 * (no branch)

 If I try to checkout any branch I get a list of files that need merge and
 then the message: error: you need to resolve your current index first.

 If I git add any of these files, what branch am I adding them to and
 merging them into?  (no branch)?

 It seems like all the git help I can find for these error messages
 presumes I can checkout a branch -- but I can't.  Any suggestions?

 Thanks,

 Curt.
 --
 Curtis Olson:
 http://www.atiak.com - http://aem.umn.edu/~uav/
 http://www.flightgear.org - http://gallinazo.flightgear.org




 --
 Curtis Olson:
 http://www.atiak.com - http://aem.umn.edu/~uav/
 http://www.flightgear.org - http://gallinazo.flightgear.org


 --
 Live Security Virtual Conference
 Exclusive live event will cover all the ways today's security and
 threat landscape has changed and how IT managers can respond. Discussions
 will include endpoint security, mobile security and the latest in malware
 threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
 ___
 Flightgear-devel mailing list
 Flightgear-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/flightgear-devel


--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list

Re: [Flightgear-devel] git help request

2012-08-08 Thread Curtis Olson
On Wed, Aug 8, 2012 at 12:06 PM, Tim Moore wrote:

 It sounds like your local tree has not been completely committed. See
 what git status says. Check out the man page for git-mv. I can't say
 more right at the moment, but I'll see if I can add more details
 later.


There are a couple other random untracked changes, but nothing inside any
of the directories that were renamed and now failing on the rebase.

Curt;.
-- 
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] [SFD] http://flightgear.org/about/ text license?

2012-08-08 Thread Arnt Karlsen
On Wed, 08 Aug 2012 16:19:07 +0700, Ivan wrote in message 
86a9y5lp10@gray.siamics.net:

  Arnt Karlsen a...@c2i.net writes:
  On Mon, 06 Aug 2012 10:33:19 +0700, Ivan wrote:
 
 […]
 
   Here in Russia, a few teams have decided that we may benefit from
   including short notes on various free software packages into our
   “Join us on SFD 2012!” flyers, and FlightGear was one of such
   packages (along with Firefox, VLC, and a few more.  Check, e. g.,
   [1]; though the discussion is obviously in Russian.)
 
   ..going there with the Chromium browser, translation is
   semi-automatic, just click the button in the drop-down translation
   menu bar.  Other browsers may have to use
   e. g. http://translate.google.com/.
 
   I'm glad it works for you (personally, I haven't managed to
 get any use of machine translation), 

..kay 8o)  This: ...
http://translate.google.com/translate?sl=autotl=nojs=nprev=_thl=enie=UTF-8layout=2eotf=1u=http%3A%2F%2Fwww.flightgear.org%2Fabout%2F
...is a fairly good Norwegian machine translation of
http://flightgear.org/about/ , it's not too bad grammatically,
what's your opinion of this Russian machine translation?:
http://translate.google.com/translate?hl=ensl=autotl=ruu=http%3A%2F%2Fwww.flightgear.org%2Fabout%2F


  but it doesn't quite answer my
   question, which is: are the FlightGear project's Web pages
 free (as in freedom)?  More specifically, can we use a fragment of
   the Introduction [2] page as the basis for our note about
   FlightGear?

..it depends ;o), the fair use clause in US copyright law gives 
you the right to copy some parts and incorporate them into your 
own Russian or satirical etc introduction to FG, which will then 
come under _your_ copyright, _as_ you write it, or, under your 
translator's copyright if your translator writes it at his own 
expense and on his initiative.  If you pays someone to do this 
for you, you _may_ have the copyrights to the work you pay for, 
it depends on your your contractual agreement with your writer 
and on the laws in your jurisdiction.

   TIA.
 
 […]
 
   Our author has translated a paragraph or so of the Introduction
   [2] page into Russian to use it as the basis for such a note,
   only to discover later that there's no statement allowing for
   such a use on that page.

..guys, given the somewhat fluid state of laws and law enforcement
in the relevant jurisdictions, I recommend giving an explicit
permission to use FG web pages as basis for the Russian Introduction,
or, giving an explicit explanation on why such an explicit permission 
is not neccessary to finish and publish the Russian Introduction,
primarily for peace of mind for our Russian friends, so they know
American style frivolous lawsuits can be swatted down, _hard_, in 
Russia too. ;o)

 […]
 
   [1]
   http://comments.gmane.org/gmane.user-groups.foss.sfd.planning.ru/47
   [2] http://flightgear.org/about/


-- 
..med vennlig hilsen = with Kind Regards from Arnt Karlsen
...with a number of polar bear hunters in his ancestry...
  Scenarios always come in sets of three: 
  best case, worst case, and just in case.

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel


Re: [Flightgear-devel] Error building FG on Windows (linking)

2012-08-08 Thread M. Carbax
No way.

I brougth from http://flightgear.simpits.org:8080/   everything but FG
source, so I put the source(2.9.0)  into thedirectory structure to
build with Cmake and MSVC10 and  NO way, same errors.


Thanks folks for your support, I give up.

2012/8/8 M. Carbax mcar...@gmail.com:
 Thanks Fred, I'll try my last chance :(

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel