]> git.mxchange.org Git - flightgear.git/log
flightgear.git
12 years agoNavDisplay: fix update lag when switching range or centre.
James Turner [Thu, 12 Jan 2012 10:08:08 +0000 (10:08 +0000)]
NavDisplay: fix update lag when switching range or centre.

12 years ago#577: blinking not working for static HUD labels
ThorstenB [Tue, 10 Jan 2012 21:01:05 +0000 (22:01 +0100)]
#577: blinking not working for static HUD labels
Only worked for dynamic labels displaying a property (mode!=NONE).

12 years ago#590: agradar copying an uninitialized string
ThorstenB [Mon, 9 Jan 2012 22:41:07 +0000 (23:41 +0100)]
#590: agradar copying an uninitialized string
Thanks to Olaf Flebbe.

12 years agovirtual destructor missing (in order to silence llvm warning)
Olaf Flebbe [Mon, 9 Jan 2012 19:42:55 +0000 (20:42 +0100)]
virtual destructor missing (in order to silence llvm warning)

12 years agoITM radio calculations are only considered valid
adrian [Mon, 9 Jan 2012 17:47:25 +0000 (19:47 +0200)]
ITM radio calculations are only considered valid
between 40 MHz and 20 GHz.
Fix for bug which assigns a frequency of 0 MHz to
AI aircraft, thus resulting in infinite values.

12 years ago#587: don't crash on negative sizes
ThorstenB [Mon, 9 Jan 2012 19:29:51 +0000 (20:29 +0100)]
#587: don't crash on negative sizes
(see simgear commit)

12 years agofix a typo
Erik Hofman [Mon, 9 Jan 2012 07:14:46 +0000 (08:14 +0100)]
fix a typo

12 years agoWhen clearing the route, skip generated waypoints.
James Turner [Sun, 8 Jan 2012 19:31:07 +0000 (19:31 +0000)]
When clearing the route, skip generated waypoints.

12 years agoHandle unset texture-compression property correctly.
Mathias Froehlich [Sun, 8 Jan 2012 19:18:52 +0000 (20:18 +0100)]
Handle unset texture-compression property correctly.

12 years agoNavDisplay: fix many bugs relating to stretched and heading-rotated symbols.
James Turner [Sun, 8 Jan 2012 17:47:13 +0000 (17:47 +0000)]
NavDisplay: fix many bugs relating to stretched and heading-rotated symbols.

12 years agoFix the sun position and fog/ambient coloring misalignment
Erik Hofman [Sun, 8 Jan 2012 15:28:43 +0000 (16:28 +0100)]
Fix the sun position and fog/ambient coloring misalignment

12 years agoMerge branch 'next' of gitorious.org:fg/flightgear into next
Erik Hofman [Sun, 8 Jan 2012 14:38:22 +0000 (15:38 +0100)]
Merge branch 'next' of gitorious.org:fg/flightgear into next

12 years agoremove some ugly while loops
Erik Hofman [Sun, 8 Jan 2012 12:51:38 +0000 (13:51 +0100)]
remove some ugly while loops

12 years agoTemporarily disable Nasal callbacks in lazily loaded scenery models
ThorstenB [Sun, 8 Jan 2012 12:31:49 +0000 (13:31 +0100)]
Temporarily disable Nasal callbacks in lazily loaded scenery models
to avoid segfaults due to multi-threading issues. Will need to be replaced
by proper fix, if this proves Nasal related segfaults to be fixed.

12 years ago#553: MP-model-loading related segfault
ThorstenB [Sun, 8 Jan 2012 12:28:49 +0000 (13:28 +0100)]
#553: MP-model-loading related segfault
MP aircraft are loaded by a separate OSG thread (introduced after FG2.4.0).
The OSG thread also calls the "modelLoaded" callback. However, we mustn't
allow the OSG thread to call FGNasalModelData::modelLoaded directly:
FGNasalModelData isn't thread-safe. There are obvious issues (_callCount++;),
tricky issues like calling the Nasal _parser_ or creating hashes and
modifying the global Nasal namespace. It doesn't use locks to protect
against another thread executing a Nasal context or running garbage
collection. It also executes Nasal code itself (the model's "load" hook),
which we also cannot allow in a separate thread...
This patch returns all Nasal parts of MP-aircraft loading (parsing,
module creation, execution) to the main thread, while keeping the
multi-threaded OSG part (loading of MP-aircraft model files itself).
The same issue exists with scenery models (see other commit).

To summarize with 2 words: It s*cks... ;-)

12 years agoPotential fixes for #548, #572, groundnetwork related segfaults
ThorstenB [Sun, 8 Jan 2012 11:31:18 +0000 (12:31 +0100)]
Potential fixes for #548, #572, groundnetwork related segfaults
Add some pointer checks - so we at least get some error message naming the
airport with the broken network.

12 years agovecotry color calculations
Erik Hofman [Sun, 8 Jan 2012 11:09:46 +0000 (12:09 +0100)]
vecotry color calculations

12 years ago#561, clean-up using normalizePeriodic. Thanks to Hyde & James.
ThorstenB [Sat, 7 Jan 2012 07:17:34 +0000 (08:17 +0100)]
#561, clean-up using normalizePeriodic. Thanks to Hyde & James.

12 years agoShortcuts support in the Cocoa menubar. We have fewer keyboard shortcuts for menu...
James Turner [Fri, 6 Jan 2012 23:46:35 +0000 (23:46 +0000)]
Shortcuts support in the Cocoa menubar. We have fewer keyboard shortcuts for menu items than I realised.

12 years agoTweaks to get TCAS / multiplayer aircraft showing on the NavDisplay.
James Turner [Fri, 6 Jan 2012 20:47:21 +0000 (20:47 +0000)]
Tweaks to get TCAS / multiplayer aircraft showing on the NavDisplay.

12 years agoTweak the app-data path on Mac, after discussion with Tat.
James Turner [Thu, 5 Jan 2012 22:10:19 +0000 (22:10 +0000)]
Tweak the app-data path on Mac, after discussion with Tat.

12 years agoFix YASim's /accelerations/pilot/{x,y,z}-accel-fps_sec computations. These
Curtis L. Olson [Thu, 5 Jan 2012 01:17:32 +0000 (19:17 -0600)]
Fix YASim's /accelerations/pilot/{x,y,z}-accel-fps_sec computations.  These
are the accelerations (forces) as felt from the pilot's perspective.  This
combines the accelerations due to change in velocity vector and gravity.

Previosly the gravity part was right, but the body accelerations were being
transformed incorrectly.  The error was very subtle and basically amounted to
the fact that inverting an axis of a vector before transforming it is not
equivalent to transforming the vector and then inverting that axis.

After this fix, pilot accelerations + gyro + gps can be fed into an external
kalman filter and it will converge properly (extra confirmation that there
was a problem and this fix corrects it.)

12 years agoOnly initialize MP subsystem if a txhost is set.
Stuart Buchanan [Wed, 4 Jan 2012 21:47:35 +0000 (21:47 +0000)]
Only initialize MP subsystem if a txhost is set.

12 years agoMark NavDisplay stateSet as STATIC
James Turner [Wed, 4 Jan 2012 12:43:25 +0000 (12:43 +0000)]
Mark NavDisplay stateSet as STATIC

12 years ago#561: keep magnetic heading within limits when mag-variation is negative
ThorstenB [Tue, 3 Jan 2012 23:00:10 +0000 (00:00 +0100)]
#561: keep magnetic heading within limits when mag-variation is negative
Thanks to Hyde!

12 years agoFix copy&paste issue in previous commit... *yuk*
ThorstenB [Tue, 3 Jan 2012 21:10:56 +0000 (22:10 +0100)]
Fix copy&paste issue in previous commit... *yuk*

12 years agocmake: Fix Xinerama and Xft dependency issue.
ThorstenB [Tue, 3 Jan 2012 21:02:48 +0000 (22:02 +0100)]
cmake: Fix Xinerama and Xft dependency issue.
Don't try to add Xinerama/Xft libraries, unless these are installed.
It seems these libraries are also not required on all systems (not required
over here...).

12 years agoFix some compiler warnings.
ThorstenB [Mon, 2 Jan 2012 22:13:51 +0000 (23:13 +0100)]
Fix some compiler warnings.
Comment out unused code.

12 years agoBugfixes and some finetuning:
Durk Talsma [Mon, 2 Jan 2012 21:23:24 +0000 (22:23 +0100)]
Bugfixes and some finetuning:
* Pregenerating taxiroutes could interfere with runway assignments by ATC, when conditions changed, resulting in a taxi to one runway and a takeoff from another
* A simpler solution for the "Error in Traffic record bug". This still needs some more testing, but I haven't seen any error message anymore, since changing to the current code.
* Initialize AI traffic at speed zero, this should prevent some weirdness observed under boundary conditions.
* Don't activate groundnetwork proximity detection for pushback traffic until the "ready for startup message is transmitted. this should allow sufficient time for them to reserve a route, but a little more testing still needs to be done.

12 years ago--debugMsg;
Durk Talsma [Sun, 1 Jan 2012 14:30:51 +0000 (15:30 +0100)]
--debugMsg;

12 years agoBugfix: Shutdown the ATC manager when it runs out of waypoints.
Durk Talsma [Sun, 1 Jan 2012 12:12:13 +0000 (13:12 +0100)]
Bugfix: Shutdown the ATC manager when it runs out of waypoints.

12 years agoMerge branch 'next' of gitorious.org:fg/flightgear into next
Durk Talsma [Sat, 31 Dec 2011 18:59:56 +0000 (19:59 +0100)]
Merge branch 'next' of gitorious.org:fg/flightgear into next

12 years agoSome commented out debugging code that may help us trace down bug 532.
Durk Talsma [Sat, 31 Dec 2011 17:16:38 +0000 (18:16 +0100)]
Some commented out debugging code that may help us trace down bug 532.

12 years agosimplify the METAR string, remove newline etc.
Torsten Dreyer [Sat, 31 Dec 2011 16:31:13 +0000 (17:31 +0100)]
simplify the METAR string, remove newline etc.

12 years agoFix for issue: 520: Error in FGTrafficRecord::setPositionAndIntentions.
Durk Talsma [Fri, 30 Dec 2011 14:27:21 +0000 (15:27 +0100)]
Fix for issue: 520: Error in FGTrafficRecord::setPositionAndIntentions.

12 years ago#545 related: User settings not saved when window was closed
ThorstenB [Thu, 29 Dec 2011 23:39:08 +0000 (00:39 +0100)]
#545 related: User settings not saved when window was closed
via the window buttons instead of pressing ESC or using menu exit.
(More code should be moved after the 2.6 release)

12 years agoMake the use of the compressed internal format a configuration option.
Mathias Froehlich [Thu, 29 Dec 2011 11:24:04 +0000 (12:24 +0100)]
Make the use of the compressed internal format a configuration option.

12 years agoFix Hudson (Jenkins!) BUILD_ID check.
ThorstenB [Wed, 28 Dec 2011 11:24:22 +0000 (12:24 +0100)]
Fix Hudson (Jenkins!) BUILD_ID check.

12 years agoGet the ATC frequency dialogs working again for the 2.6 release.
James Turner [Tue, 27 Dec 2011 22:55:52 +0000 (22:55 +0000)]
Get the ATC frequency dialogs working again for the 2.6 release.

12 years agoNav-display: expose TCAS threat level correctly.
James Turner [Tue, 27 Dec 2011 20:19:10 +0000 (20:19 +0000)]
Nav-display: expose TCAS threat level correctly.

12 years ago#545: Fix ATC chatter sound settings being ignored
ThorstenB [Tue, 27 Dec 2011 12:04:09 +0000 (13:04 +0100)]
#545: Fix ATC chatter sound settings being ignored
FGSampleQueue is initialized at run-time, long after preferences are
loaded from the persistent files - so it should not reset anything.

12 years agoSome warning fixes, mostly unused variables
Torsten Dreyer [Sun, 25 Dec 2011 13:41:47 +0000 (14:41 +0100)]
Some warning fixes, mostly unused variables

12 years agoMerge branch 'next' of gitorious.org:fg/flightgear into next
Durk Talsma [Sat, 24 Dec 2011 16:56:45 +0000 (17:56 +0100)]
Merge branch 'next' of gitorious.org:fg/flightgear into next

12 years agoRemove a stray debug message.Z
Durk Talsma [Sat, 24 Dec 2011 15:34:33 +0000 (16:34 +0100)]
Remove a stray debug message.Z

12 years agoproperly add librt when clock_gettime is used
Erik Hofman [Sat, 24 Dec 2011 10:34:35 +0000 (11:34 +0100)]
properly add librt when clock_gettime is used

12 years agoAdd the [Bb]uild directory and vi(m) swap files to the ignore list
Erik Hofman [Sat, 24 Dec 2011 10:21:36 +0000 (11:21 +0100)]
Add the [Bb]uild directory and vi(m) swap files to the ignore list

12 years agoFix for SF bug #3171743 - P-factor does not take into account the thruster pitch...
Erik Hofman [Fri, 23 Dec 2011 13:18:38 +0000 (14:18 +0100)]
Fix for SF bug #3171743 - P-factor does not take into account the thruster pitch and yaw angles

12 years agoFix #535: METAR from command line ignored
Torsten Dreyer [Thu, 22 Dec 2011 21:11:37 +0000 (22:11 +0100)]
Fix #535: METAR from command line ignored

12 years agoAdd test-mode to NavDisplay, and hence fix bugs in range / scale handling.
James Turner [Thu, 22 Dec 2011 14:07:06 +0000 (14:07 +0000)]
Add test-mode to NavDisplay, and hence fix bugs in range / scale handling.

12 years agoFix issues related to #419.
ThorstenB [Mon, 19 Dec 2011 20:36:42 +0000 (21:36 +0100)]
Fix issues related to #419.

12 years agoFix minor compiler and checker warnings.
ThorstenB [Mon, 19 Dec 2011 20:35:50 +0000 (21:35 +0100)]
Fix minor compiler and checker warnings.
(rpm-checker was unhappy about our outdated FSF address :) )

12 years agocomment out unused variables and function and properly initialize variables
Erik Hofman [Mon, 19 Dec 2011 15:50:21 +0000 (16:50 +0100)]
comment out unused variables and function and properly initialize variables

12 years agoUpdate man pages.
ThorstenB [Mon, 19 Dec 2011 10:35:02 +0000 (11:35 +0100)]
Update man pages.
Drop obsolete pages.
Add fgpanel and terrasync man pages.

12 years ago#480: fgadmin build dependency
ThorstenB [Sun, 18 Dec 2011 18:45:59 +0000 (19:45 +0100)]
#480: fgadmin build dependency
"untarka.c" needs ZLIB.

12 years agofgadmin: fix compiler warnings
ThorstenB [Sun, 18 Dec 2011 18:43:46 +0000 (19:43 +0100)]
fgadmin: fix compiler warnings
Also fixes mismatching "tarextract" declaration vs definition issue.

12 years agoTry to take care of FLTK external dependencies on Linux
Frederic Bouvier [Sun, 18 Dec 2011 15:18:46 +0000 (16:18 +0100)]
Try to take care of FLTK external dependencies on Linux

12 years agoRestore JSBsim and Yasim in VS2008 build
Frederic Bouvier [Sun, 18 Dec 2011 15:14:53 +0000 (16:14 +0100)]
Restore JSBsim and Yasim in VS2008 build

12 years ago#525 related: add compiler search path for every library
ThorstenB [Sun, 18 Dec 2011 11:40:34 +0000 (12:40 +0100)]
#525 related: add compiler search path for every library
Consider search path for every single library as reported/found by CMake.
Most includes sit in the same directory (so the same directory is reported
for almost all libraries), however this may not be the case for every
system or library.

12 years agoMerge branch 'next' of git://gitorious.org/fg/flightgear into next
Frederic Bouvier [Sat, 17 Dec 2011 17:13:31 +0000 (18:13 +0100)]
Merge branch 'next' of git://gitorious.org/fg/flightgear into next

12 years agoBetter c++ design to avoid leaks in case of exceptions
Frederic Bouvier [Sat, 17 Dec 2011 17:13:05 +0000 (18:13 +0100)]
Better c++ design to avoid leaks in case of exceptions

12 years agoAdd some debug messages to help analyzing #385.
ThorstenB [Sat, 17 Dec 2011 14:26:50 +0000 (15:26 +0100)]
Add some debug messages to help analyzing #385.

12 years agoAvoid spamming the log output
ThorstenB [Sat, 17 Dec 2011 14:22:50 +0000 (15:22 +0100)]
Avoid spamming the log output
Stop printing "State == Running" debug messages in every update loop
(makes "--log-level=debug" a lot more usable)

12 years agoAlso expose the true sun color in the property tree.
Erik Hofman [Sat, 17 Dec 2011 09:57:08 +0000 (10:57 +0100)]
Also expose the true sun color in the property tree.

12 years agofgviewer: Improove reader/writer option command line handling.
Mathias Froehlich [Sat, 17 Dec 2011 07:28:33 +0000 (08:28 +0100)]
fgviewer: Improove reader/writer option command line handling.

12 years agofgviewer: add DatabasePager.
Mathias Froehlich [Fri, 16 Dec 2011 20:45:33 +0000 (21:45 +0100)]
fgviewer: add DatabasePager.

12 years agofgviewer: add StateSetManipulator.
Mathias Froehlich [Fri, 16 Dec 2011 20:45:09 +0000 (21:45 +0100)]
fgviewer: add StateSetManipulator.

12 years agoExpose the cloud color in the property tree
Erik Hofman [Fri, 16 Dec 2011 14:37:16 +0000 (15:37 +0100)]
Expose the cloud color in the property tree

12 years agoRemove AI prefix for the sound path and add it to the config files instead
Erik Hofman [Wed, 14 Dec 2011 11:45:22 +0000 (12:45 +0100)]
Remove AI prefix for the sound path and add it to the config files instead

12 years agoFix windows build
Torsten Dreyer [Tue, 13 Dec 2011 19:48:50 +0000 (20:48 +0100)]
Fix windows build

12 years agoMerge branch 'next' into attenuation
adrian [Tue, 13 Dec 2011 11:35:45 +0000 (13:35 +0200)]
Merge branch 'next' into attenuation

12 years agoMerge branch 'navaids-radio' into attenuation
adrian [Tue, 13 Dec 2011 11:01:23 +0000 (13:01 +0200)]
Merge branch 'navaids-radio' into attenuation

12 years agotake care of cases where the model obstructs the antenna
adrian [Tue, 13 Dec 2011 10:58:44 +0000 (12:58 +0200)]
take care of cases where the model obstructs the antenna

12 years agoMerge branch 'next' into navaids-radio
adrian [Mon, 12 Dec 2011 12:56:28 +0000 (14:56 +0200)]
Merge branch 'next' into navaids-radio

12 years agoreaneble ai modeul sound effects
Erik Hofman [Mon, 12 Dec 2011 09:49:09 +0000 (10:49 +0100)]
reaneble ai modeul sound effects

12 years agoMerge branch 'next' into attenuation
adrian [Sun, 11 Dec 2011 17:06:24 +0000 (19:06 +0200)]
Merge branch 'next' into attenuation

12 years agoAdd hud-cycling back - issue #337
James Turner [Sun, 11 Dec 2011 14:12:17 +0000 (14:12 +0000)]
Add hud-cycling back - issue #337

12 years agoAdd --log-class option, improve logging classes.
ThorstenB [Sun, 11 Dec 2011 12:55:56 +0000 (13:55 +0100)]
Add --log-class option, improve logging classes.
Replace SG_GENERAL by more specific log classes in many places.
Allow "," to separate logging classes (using "|" is odd on the
command-line).
Also add new option to make logging more useful for developers.
You can use:
  --log-level=debug --log-class=environment
to only get environment debug messages, or
  --log-level=debug --log-class=sound,ai
to only get debug messages related to the sound or AI subsystem.

12 years agoProvide error message when file isn't found.
ThorstenB [Sun, 11 Dec 2011 12:04:10 +0000 (13:04 +0100)]
Provide error message when file isn't found.

12 years agoMultiple --atlas options are valid (one for Atlas, one for Terrasync)
Frederic Bouvier [Sun, 11 Dec 2011 12:12:18 +0000 (13:12 +0100)]
Multiple --atlas options are valid (one for Atlas, one for Terrasync)

12 years ago#513: netgui alignment mismatching on 32bit/64bit machines
ThorstenB [Fri, 9 Dec 2011 18:01:15 +0000 (19:01 +0100)]
#513: netgui alignment mismatching on 32bit/64bit machines
netgui data structure now is identical for all platforms. Manually aligned
the fields, so compilers do not add (CPU architecture-specific) padding.

12 years agoMerge branch 'next' into navaids-radio
adrian [Fri, 9 Dec 2011 16:57:50 +0000 (18:57 +0200)]
Merge branch 'next' into navaids-radio

12 years agoMerge branch 'next' into attenuation
adrian [Fri, 9 Dec 2011 16:57:38 +0000 (18:57 +0200)]
Merge branch 'next' into attenuation

12 years agoLower log level for event input/udev messages.
ThorstenB [Fri, 9 Dec 2011 16:20:28 +0000 (17:20 +0100)]
Lower log level for event input/udev messages.

12 years agoAvoid useless warnings during FG startup.
ThorstenB [Fri, 9 Dec 2011 16:19:45 +0000 (17:19 +0100)]
Avoid useless warnings during FG startup.
Do not warn about missing scenery manager, unless it is really needed.
Also raise warn level for multiple init calls.

12 years ago#510: Fix disappearing AIShips.
ThorstenB [Fri, 9 Dec 2011 16:06:19 +0000 (17:06 +0100)]
#510: Fix disappearing AIShips.
Untangle AI reinit and init methods. Some code in init hooks expects to be
called once only. Derived classes should not redirect their reinit to init,
even if this seems fine for the methods of the derived class itself. This
also triggers the init methods of all base classes, which may not expect
multiple calls to their init methods (or to "init" on "reinit").

12 years agoFix memory leak with FGAIModelData.
ThorstenB [Fri, 9 Dec 2011 16:03:14 +0000 (17:03 +0100)]
Fix memory leak with FGAIModelData.
Be lazy and use ref pointers - to remove memory automatically.

12 years agoRemove interface from Nasal
adrian [Fri, 9 Dec 2011 13:44:22 +0000 (15:44 +0200)]
Remove interface from Nasal

12 years agoitm.cpp: don't polute the global namespace
adrian [Thu, 8 Dec 2011 18:16:11 +0000 (20:16 +0200)]
itm.cpp: don't polute the global namespace

12 years agoClean up my code in NasalSys.cxx
adrian [Thu, 8 Dec 2011 17:48:31 +0000 (19:48 +0200)]
Clean up my code in NasalSys.cxx

12 years agoMerge branch 'next' into navaids-radio
adrian [Thu, 8 Dec 2011 13:29:22 +0000 (15:29 +0200)]
Merge branch 'next' into navaids-radio

12 years agoDocument the code better;
adrian [Thu, 8 Dec 2011 13:05:27 +0000 (15:05 +0200)]
Document the code better;

Add some checks in the clutter function;
Use string pointers to get materials;

12 years agoAdd fgpanel to the mix
Frederic Bouvier [Wed, 7 Dec 2011 07:43:54 +0000 (08:43 +0100)]
Add fgpanel to the mix

12 years agoSend geod from Nasal, properly document the code, take some parameters from properties
adrian [Tue, 6 Dec 2011 21:00:50 +0000 (23:00 +0200)]
Send geod from Nasal, properly document the code, take some parameters from properties

12 years agoExpose a radio function (receiveBeacon) to the Nasal subsystem
adrian [Tue, 6 Dec 2011 19:03:40 +0000 (21:03 +0200)]
Expose a radio function (receiveBeacon) to the Nasal subsystem

12 years agoMerge commit 'refs/merge-requests/18' of git://gitorious.org/fg/flightgear into merge...
Durk Talsma [Tue, 6 Dec 2011 17:07:48 +0000 (18:07 +0100)]
Merge commit 'refs/merge-requests/18' of git://gitorious.org/fg/flightgear into merge-requests/18

12 years agoMerge branch 'next' of gitorious.org:fg/flightgear into next
Curtis L. Olson [Tue, 6 Dec 2011 15:49:27 +0000 (09:49 -0600)]
Merge branch 'next' of gitorious.org:fg/flightgear into next

12 years agoCommit changes so I can switch branches without conflicts.
Curtis L. Olson [Tue, 6 Dec 2011 15:47:56 +0000 (09:47 -0600)]
Commit changes so I can switch branches without conflicts.

12 years agoLower receiver sensitivity, modify loading of antenna pattern
adrian [Tue, 6 Dec 2011 09:38:48 +0000 (11:38 +0200)]
Lower receiver sensitivity, modify loading of antenna pattern

12 years agoMerge branch 'attenuation' into navaids-radio
adrian [Tue, 6 Dec 2011 08:27:03 +0000 (10:27 +0200)]
Merge branch 'attenuation' into navaids-radio

Conflicts:
src/Radio/radio.cxx

12 years agoMerge branch 'next' into attenuation
adrian [Tue, 6 Dec 2011 00:15:04 +0000 (02:15 +0200)]
Merge branch 'next' into attenuation

Conflicts:
src/Radio/radio.cxx