1
0
Fork 0
Commit graph

770 commits

Author SHA1 Message Date
Stuart Buchanan
4a70a703a8 Add Joystick Configuration dialog, allowing in-sim configuration of joysticks. 2012-08-24 22:53:21 +01:00
Gijs de Rooy
b950ff1e6e Fix automated METAR snow line. 2012-08-11 19:56:29 +02:00
Stuart Buchanan
4ec24853a8 Create an Environment Settings dialog for non-weather environment settings
such as snow level, dust, wetness, and texture set.

Also add a parameter to control whether the snow level moves with METAR,
and retire /environment/mysnow-level-m.
2012-08-09 22:52:51 +01:00
Stuart Buchanan
c71e0b92f1 Add warning text for random buildings, which require lots of memory. 2012-08-09 21:48:27 +01:00
Stuart Buchanan
0a40f0be0f Updated Weather dialog
- Bug fix so manual configuration works properly
- Interpret METAR directly to set default wind settings for Local Weather mode.
2012-08-09 21:38:36 +01:00
Stuart Buchanan
89928f8350 Add missing weather configuration dialog from Unified Weather commit. 2012-08-07 23:14:43 +01:00
Stuart Buchanan
ed068bef82 Unification of Weather UI. 2012-08-07 21:27:29 +01:00
Thorsten Renk
9be134b34d Procedural Texturing 2012-08-07 09:01:14 +02:00
Frederic Bouvier
c3bcb8a6de Add film wear to the cinema postprocessing effects 2012-08-05 18:51:02 +02:00
Frederic Bouvier
fab3d677b0 Night vision has precedence over cinema effects 2012-08-05 11:57:48 +02:00
Frederic Bouvier
714555e74b Add lateral chromatic aberration (purple/green fringe) to the cinema postprocessing effects (Rembrandt) 2012-08-05 11:43:56 +02:00
Frederic Bouvier
9010535292 Add radial lens distortion to the cinema postprocessing effects (Rembrandt) 2012-08-05 10:43:53 +02:00
Frederic Bouvier
33634a5ba1 Add slider values to the dialog 2012-08-05 00:08:31 +01:00
Frederic Bouvier
5627a4e8f8 Cinema effects in the Rembrandt framework 2012-08-05 00:08:27 +01:00
Frederic Bouvier
6013f3360e Night vision post processing effect in Rembrandt 2012-08-05 00:08:23 +01:00
Thomas Geymayer
9cd2d64f28 Update ground location dialog to use new parking hash 2012-07-31 23:22:27 +02:00
Frederic Bouvier
e911e6b5f8 Add quality selection to lights 2012-07-22 10:08:04 +02:00
Vivian Meazza
24e7e5fb68 Whoops!
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-21 09:34:00 +01:00
Vivian Meazza
d8a76e4512 Merge branch 'work' of D:\Git_New\fgdata 2012-07-21 00:16:51 +01:00
Stuart Buchanan
2ddf719a82 Add debug options to reload materials and the scenery. 2012-07-19 22:07:19 +01:00
Stuart Buchanan
e91620a456 Remove building density slider. Values > 1.0 have massive memory
impacts and can result in FG paging to disk continually and hanging
some systems, with no obvious cause or fix (particularly with auto-save).

For the moment we simply remove the slider, allowing power users to
modify the density in preferences.xml.

Once the memory consumption of buildings has been addressed we should
be able to put the slide back in.
2012-07-19 21:36:06 +01:00
Vivian Meazza
6bceb5695a Revert "Bugfix"
This reverts commit 62a39ccea745faf722e2c50ef257d17b66015fc1.

Conflicts:

	gui/dialogs/AIcarrier.xml
2012-07-19 09:45:39 +01:00
ThorstenB
e3be4443f6 Fix untranslatable "reload aircraft model" item.
Thanks to sa7k.
2012-07-13 19:36:30 +02:00
Stuart Buchanan
efe0ba3bd5 Improve layout of season selector. 2012-07-12 12:13:48 +01:00
ThorstenB
ce36295c4a #544: slider to control AI sound volume missing
(not a bugfix really, but just too trivial).
2012-07-07 17:26:05 +02:00
Stuart Buchanan
680362337c Add control of season to GUI to be set in-sim. 2012-07-06 20:11:51 +01:00
ThorstenB
e6ec1218ba Fix ai-traffic GUI checkbox
Setting was lost on sim-reset and restart
/sim/ai-traffic props are entirely obsolete (to be removed after 2.8)
2012-07-05 19:37:43 +02:00
Vivian Meazza
e84ff39ee8 Remove debug messages
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-04 20:57:18 +01:00
Vivian Meazza
85d64deb04 Bugfix
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-07-04 20:57:14 +01:00
Stuart Buchanan
9d8868245e Limit change of building density to 0.1, to match display. 2012-06-30 22:15:07 +01:00
Stuart Buchanan
c7377a5732 Make building density display consistent with vegetation density.
No-one needs two decimal places :)
2012-06-30 21:43:59 +01:00
Emilian Huminiuc
876e3e11db fix transition.eff copy paste failure, and enable the slider selectively under Rembrandt.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-30 14:55:52 +03:00
Frederic Bouvier
82e86c6ebc Adjust legal filtering values 2012-06-26 09:12:23 +02:00
Frederic Bouvier
4e241640b6 Add a bloom strength property and a slider in the Rembrandt dialog 2012-06-26 09:02:21 +02:00
Frederic Bouvier
ecbcdbbd02 Water shader has a Rembrandt version now 2012-06-26 08:49:11 +02:00
Frederic Bouvier
2b87e630bf Add shadow map to the list of available rendering buffers 2012-06-25 09:39:23 +02:00
Frederic Bouvier
c19d8f798a Allow the generic shader to be used in Rembrandt, after the runway effect was converted 2012-06-24 13:13:10 +02:00
Gijs de Rooy
38b38aeee2 Hide unsupported shader options when using lightfield or Rembrandt renderer. 2012-06-20 23:11:26 +02:00
Gijs de Rooy
573c94f88e Always show correct setting on fps throttle slider. 2012-06-17 16:43:18 +02:00
Gijs de Rooy
d164d9b2a7 Special Rembrandt dialog with all available options. Cleanup rendering dialog to make place for Rembrandt button. 2012-06-16 23:27:58 +02:00
Emilian Huminiuc
ae1e670010 Add Aircraft model reload to the debug menu
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-06-17 00:00:12 +03:00
Gijs de Rooy
a5fd645def Default location on ground to best runway. 2012-06-12 20:28:04 +02:00
Flightgear Development
23536748f7 Terrain haze bugfixes 2012-06-11 20:23:31 +02:00
Frederic Bouvier
be6c2e3fc6 Disable stereoscopic options in Rembrandt 2012-06-03 16:19:10 +02:00
Frederic Bouvier
eea2f89080 Fix menubar 2012-05-18 12:53:33 +02:00
Frederic Bouvier
e27aa0c4d9 Add another digit to ambient occlusion strength 2012-05-18 12:43:28 +02:00
Frederic Bouvier
1932ddb014 Allow to select debugged buffers in Rembrandt 2012-05-18 12:42:34 +02:00
Frederic Bouvier
58c5a389ce Allow to adjust ambient occlusion strength 2012-05-18 09:00:48 +02:00
Stuart Buchanan
8fa093ce76 Add flags for bloom and ambient occlusion to Rendering Dialog. 2012-05-12 22:02:04 +01:00
Frederic Bouvier
1a5cc682a9 Add condition on ambient occlusion and a menu item to switch it on and off if the stage is enabled in the pipeline 2012-05-12 09:20:13 +02:00
Frederic Bouvier
5cfca250b1 rename /sim/rendering/rembrandt -> /sim/rendering/rembrandt/enabled
and put rembrandt-related properties in /sim/rendering/rembrandt/
2012-05-12 09:20:04 +02:00
James Turner
3389049325 Switch route-manager to use Nasal APIs for more commands.
Airways routing is now driven via Nasal.
2012-05-09 00:23:54 +01:00
James Turner
a26adb39af Remove an un-guarded member access in a debug dump. 2012-05-07 16:39:56 +01:00
James Turner
5013d7ae45 Update route-manager dialog for new Nasal API. 2012-05-07 00:41:57 +01:00
ThorstenB
ec26692360 Remove menu labels from menubar.xml
to avoid confusion, since labels are read from the language resource now.
2012-05-06 10:08:51 +02:00
ThorstenB
337aeb7fe4 Return 'ATC Services in Range' dialog to service 2012-05-01 11:12:44 +02:00
ThorstenB
d51a79ba5b Improve MP dialog and add option to configure AI traffic 2012-05-01 11:10:37 +02:00
ThorstenB
4b1d51a801 Improve scenario dialog
Support optional name for scenarios.
Add explicit scenario enable/disable switch.
2012-04-30 19:22:00 +02:00
Stuart Buchanan
f80affa66b Reduce the maximum value of the building-density slider. At density 5, ~95% of the building placements are too close to another building. 2012-04-28 20:03:55 +01:00
Flightgear Development
2b972341b3 Terrain Haze v1.3 2012-04-26 17:22:58 +03:00
James Turner
9e0cedf568 Location-on-ground - show the airport name, since we have it. 2012-04-26 11:00:15 +01:00
James Turner
13c145a6d9 Use new Nasal parking data to populate a combo box for parking positions. 2012-04-25 16:10:28 +01:00
James Turner
a1411ae7fd Update route-manager dialog for revised Nasal API. 2012-04-25 15:56:35 +01:00
Stuart Buchanan
98e7a194e8 Random buildings - initial commit of data portion. Requires
simgear change to have any effect.
2012-04-24 21:55:37 +01:00
ThorstenB
8506c104dd Separate the keyboard hint from menu labels.
Use new "key" property for menu items.
2012-04-21 20:28:24 +02:00
ThorstenB
79afe756e9 Improve German language resource. 2012-04-19 21:28:51 +02:00
ThorstenB
278a7db2bf Add missing name tags to menu items.
Also enable rendering buffer option for Rembrandt only.
2012-04-18 16:00:38 +02:00
ThorstenB
19d7be312d Add slider to configure frame-rate throttling. 2012-04-09 00:05:48 +02:00
Gijs de Rooy
fba49c56a3 Add Rembrandt's shadow and map-size options to the rendering dialog. 2012-04-04 22:29:33 +02:00
ThorstenB
1727ec1379 #729: make shader options dialog work for migrating users
Users with fgfs <= 2.6.0 have the userarchived flag set for
/sim/rendering/shaders/quality-level, which brakes the new dialog.
2012-04-01 13:06:40 +02:00
Gijs de Rooy
503fa5ece2 Disable OK button when no runway is set. 2012-03-31 17:07:25 +02:00
Frederic Bouvier
874c1223fb Add a debug menu item to show and hide rendering buffers for the Rembrandt renderer 2012-03-25 18:50:12 +02:00
ThorstenB
b62c1c01b7 Avoid duplication of "findElementByName" function.
Now moved to common gui.nas.
2012-03-24 12:45:58 +01:00
Gijs de Rooy
4ec144228b Close shader options dialog when Back button is pressed. 2012-03-11 22:00:59 +01:00
Gijs de Rooy
8e863bbd28 Allow shaders to be disabled/set through a commandline option.
Use --prop:/sim/rendering/shaders/quality-level=-1 to enable the custom
settings in the Shader Options dialog.
Apart from that the quality-level property will work as before (0 disables
all shaders, 5 puts all shaders to max.
2012-03-10 17:09:23 +01:00
Frederic Bouvier
ebc1002139 Sunrises 1.2 by Thorsten Renk 2012-03-08 23:22:27 +01:00
ThorstenB
f8e4c2165d #643 rendering options dialog, "sky dome scattering" vs "shader quality"
"Shader quality" slider does not influence/enable/disable the "sky dome
scattering" effect, so the GUI checkboxes should also be independent.
2012-02-06 23:24:05 +01:00
Stuart Buchanan
207b6edf60 Random object and vegetation masks, and vegetation density control. 2012-02-05 23:08:08 +00:00
Torsten Dreyer
d63d9c98e7 Local/Global Weather Menu cleanup
- use just a single "Weather" menu item
- add buttons to switch between global and local weather dialogs
- Rename Global Weather to Basic Weather
- Rename Local Weather to Advanced Weather
2012-01-22 18:29:11 +01:00
Stuart Buchanan
28ff36323b Correct capitalization of Multiplayer Settings 2012-01-13 14:52:34 +00:00
ThorstenB
e2fd73f011 Don't edit MP callsign while online. 2012-01-08 13:37:22 +01:00
Anders Gidenstam
e7408c63fb Updated MPCarrier:
- Fixed problems occuring when deployed outside fg-root.
- Got rid of the ugly ac-type property.
- Cleaned up the 3d model XML files.
- Improved carrier player detection.
- Improved the no MPCarriers found message.
2012-01-07 15:58:21 +01:00
ThorstenB
fdcd319c9f Fix global weather dialog.
Don't try to call "local_weather" when it isn't loaded.
2012-01-07 09:42:36 +01:00
Stuart Buchanan
2df253d8fc Add controls for lat/lon format to HUD config dialog, and clean up old (commented out) controls from the menu bar itself. 2012-01-06 00:03:11 +00:00
Stuart Buchanan
f0acff6f7d Fix usability issues with terrasync dialog
- Change from a directory selection dialog to a combo list of valid directories
- Only allow directories in fg-scenery to be selected
- Don't allow FG_ROOT/Scenery to be selected (interferes badly)
- Only allow terrasync to be enabled once a directory has been defined.
2012-01-05 22:52:18 +00:00
Torsten Dreyer
8da025920b Fix #567: disable local weather global weather scenario changes 2012-01-05 13:52:17 +01:00
Stuart Buchanan
34eb640a76 Further updates to the Multiplayer Settings dialog
- Now enabled even when no MP settings configured on command-line
- Add Server Status button to launch the MP Server status URL
- Minor layout cleanup.
2012-01-04 21:53:25 +00:00
Stuart Buchanan
316cf85557 Update MP Server descriptions 2012-01-03 23:38:26 +00:00
Stuart Buchanan
66e7d103f1 Update multiplayer settings dialog:
- Add list of current (as of 3 Jan 2012) MP servers
- Add Connect/Disconnect buttons
2012-01-03 23:33:26 +00:00
Frederic Bouvier
56afb80358 Local Weather 1.4 by Thorsten Renk : fixes lots of graphical errors and transparency issues and provides a consistent GUI. 2012-01-03 20:21:34 +01:00
Gijs de Rooy
dde2115a59 Pre-populate dialog with original airport, add best-runway option. 2012-01-03 15:29:23 +01:00
Gijs de Rooy
7bb78e9477 Correct model shader slider range. 2012-01-03 14:22:56 +01:00
Gijs de Rooy
8f4d761749 Fix redout-slider, correct indentation. 2012-01-02 23:31:00 +01:00
ThorstenB
ae5d1ca832 Prepare about dialog for 2.6.0 @ 2012 2011-12-29 14:50:49 +01:00
James Turner
441b0d7b30 Update atc-frequency dialogs for revised command interface. 2011-12-27 22:56:48 +00:00
Gijs de Rooy
6c971211b8 Quality slider overwrites custom shader settings. All effects now listen to the new sim/rendering/shaders/<foo> properties. 2011-12-12 17:04:36 +01:00
ThorstenB
58f72fff08 Checkbox for AI sound support. 2011-12-09 23:52:35 +01:00
Gijs de Rooy
f852529e56 Adjust snow line based on METAR. Snow level is only adjusted when METAR reports snow below the user set altitude. 2011-12-06 20:39:05 +01:00
Gijs de Rooy
2ca355bc82 Fix issue #511: effects use new property for snow-level 2011-12-06 11:33:19 +01:00
Vivian Meazza
8a5b3d744f Bugfix
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-12-02 15:50:56 +00:00
Vivian Meazza
2be5380532 Correct path for snow, adjust slider size
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-12-02 15:41:42 +00:00
Vivian Meazza
c7db6b995b Make all shaders controllable collectively and individually
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-12-01 21:55:00 +00:00
Vivian Meazza
04824c4230 New dialog
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-11-28 09:31:22 +00:00
Vivian Meazza
0a059aad74 Modified dialog
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2011-11-28 09:22:42 +00:00
Stuart Buchanan
cc58f7e32e Remove reliance of 3d clouds on /sim/rendering/shader-effects 2011-11-24 22:30:36 +00:00
Stuart Buchanan
6fc8b10667 Fixes for random vegetation:
1) Remove dependency on the /sim/rendering/shader-effects
2) Fix http://code.google.com/p/flightgear-bugs/issues/detail?id=494 where
toggling the random vegetation on, iff initiall set off, did not generate
new random vegetation. Fixed by forcing a tile reload in the same way as
used for random objects.
2011-11-24 21:41:05 +00:00
ThorstenB
32c204fe00 Add system performance dialog. 2011-11-19 15:56:44 +01:00
ThorstenB
f76e302908 Map dialog transparency option
Helpful when keeping the map dialog open while flying.
2011-10-11 22:09:01 +02:00
ThorstenB
f31f09e4d5 replay system: gui update 2011-10-09 20:23:16 +02:00
ThorstenB
a79833070a Switch to generic "open-browser" command. 2011-10-09 12:45:50 +02:00
ThorstenB
5acd6d4c04 Improve keyboard control for replay system.
Keys should also work when dialog is hidden (but replay is active).
2011-10-03 20:27:19 +02:00
ThorstenB
d281490ae1 Improve LOD dialog.
Also enable LOD for AI/MP aircraft by default.
2011-10-03 12:19:09 +02:00
ThorstenB
7370dc93c1 Replay upgrade, part IV: new GUI, config settings, keyboard bindings 2011-10-01 23:27:54 +02:00
Frederic Bouvier
928789a0d5 Local Weather 1.35 by Thorsten Renk 2011-09-23 23:22:19 +02:00
James Turner
ded0a18b5e Zoom controls on the map dialg. 2011-09-18 13:00:18 +01:00
Torsten Dreyer
65b1fd20e7 Location-in-Air: pick nearest VOR/NDB (fix#228)
When entering a duplicate VOR or NDB id into the Location-in-Air
dialog, the first entry in the database was picked. This patch
assumes that the station with the given ID nearest to the current
position was requested.
A better fix would probably be to present the user a list of found
stations - that's something for the future.
2011-08-22 20:01:55 +02:00
ThorstenB
b4b527b600 Add button to select download directory 2011-08-21 15:19:02 +02:00
ThorstenB
fb984bf8ce Option to set screenshot directory. 2011-08-21 15:17:16 +02:00
ThorstenB
8e7d7012ce Directory dialog
New directory dialog - just an option for the existing file dialog really.
2011-08-21 15:00:45 +02:00
ThorstenB
935380d3cf Fix: "Enable animated jetways" setting not working
Checkbox in rendering dialog toggled the wrong/non-existing property...
2011-08-14 13:51:49 +02:00
ThorstenB
c4626512a8 route manager: cruise speed/altitude inputs not working
Missing "dialog-apply" => properties not updated
2011-08-13 22:53:24 +02:00
ThorstenB
5e09b47f06 Highlight the headline "experimental"
Some test reports suggest people didn't notice the "experimental" bit...
2011-08-13 13:01:23 +02:00
Stuart Buchanan
6b09683170 Increase maximum 3D cloud visibility range to 45km to help with Local Weather integration. 2011-08-07 13:42:33 +01:00
ThorstenB
faa27266dc #232: reintroduce "point sprites for runway lights" switch
Make runway lights work when point sprites aren't enabled (mainly ATI)
(also requires fg/sg update).
Some white-space cleanup.
2011-07-31 13:13:37 +02:00
ThorstenB
bddac3cb78 Minor dialog text updates
- Add unit of OSG display settings (unit is meters according to OSG docs).
- "frame spacing" is more comprehensible
2011-07-29 20:54:56 +02:00
Torsten Dreyer
58b5fb1358 Fix #143:ATC/AI -> Scenario Menu calls re-init on close
Removed reinit(ai_model) which was not required and
disturbed other AI models.
2011-07-14 19:51:48 +02:00
Stuart Buchanan
3a53827272 Minor UI layout changes.
- Change title of static LOD and View dialogs to be closer to menu description.
- Improve layout of About dialog, add Close button, no-longer modal.
2011-07-11 22:15:23 +01:00
ThorstenB
ae5f44dfe1 #365: names missing for some menu items which should be customizable
Some white-space clean-up.
2011-07-08 00:26:41 +02:00
Gijs de Rooy
a367021168 Fix About-dialog copy&paste fail 2011-07-06 23:07:28 +02:00
ThorstenB
0ece95127c Thorsten Renk: local weather 1.18
fixes for a couple of issues, some improved textures/cloud model changes,
smooth instead of hard visibility transitions, updated documentation.
Also removed 'Test' entries from the menu.
(ThorstenB: Also cleaned-up Docs/ folder, moving local weather
documentation images to sub folder).
2011-07-03 23:39:01 +02:00
Frederic Bouvier
8c238bcec1 Embedded Terrasync dialog: need to apply before reinit to get the scenery-dir correctly 2011-06-18 13:02:35 +02:00
Martin Spott
1f64676296 Ryan Miller: Get rid of no-op jetway XML files. 2011-06-18 01:33:57 +02:00
Martin Spott
360d98d46d Ryan Miller: Fix Jetway dialogue Nasal runtime error 2011-06-17 21:28:25 +02:00
Martin Spott
077806cf18 Merge branch 'master' of git.gitorious.org:fg/fgdata 2011-06-17 00:46:40 +02:00
James Turner
3e027a45be Initial work on multiplayer config dialog. 2011-06-16 23:33:06 +01:00
Ryan Miller
887b9704b5 (Animated jetways) Fix dialog "can't find object" Nasal errors 2011-06-16 15:24:31 -07:00
Ryan Miller
3a5b53c0e3 (Animated jetways) Updated core files and jetway definition files to use relative elevations, moved menubar item to AI/ menu, "enabled" and "debug" settings are now saved over multiple sessions, core files are now part of a Nasal subsystem, use airline-specific model files, put less load on the loop by using an _active property for each jetway object 2011-06-15 20:52:45 -07:00
Gijs de Rooy
a4e69e95dc Issue 344: remove time-of-day key shortcuts 2011-06-15 15:39:02 +02:00
ThorstenB
1bf8b99bc9 Adapted local weather package and menu to new submodule structure. 2011-06-13 22:27:44 +02:00
ThorstenB
717b3da52b Added GUI/menu item for scenery download/update.
(Now including the actual GUI...)
2011-06-13 20:48:09 +02:00
ThorstenB
539716828b Added GUI/menu item for scenery download/update. 2011-06-13 20:40:46 +02:00
ThorstenB
04fb5b3066 Adapting to new screen-shot command
Success/error report is now automatically displayed by a listener.
2011-06-13 20:38:04 +02:00
ThorstenB
4f838934cb Fix tutorial marker menu item. Thanks to Gijs for reporting. 2011-06-13 19:37:16 +02:00
ThorstenB
c45d7d5665 Revert "Adapting to new screen-shot command"
This reverts commit 1b7918f45099275a6c0bb340f3b525b65c9dae9d.
2011-06-13 00:59:34 +02:00
ThorstenB
f84ce36d90 Fixed issue with "unnamed view".
Do not show "unnamed views" (views have no name when they belong to
another aircraft).
2011-06-12 15:31:57 +02:00
ThorstenB
92b3358f83 Moved/re-ordered local weather dialogs
as discussed with Thorsten Renk.
Suggestions on better namings for menu items still welcome.
2011-06-06 20:06:52 +02:00
ThorstenB
7db6c6f876 Jetway menu entry.
(probably caused by conflicting revert).
2011-06-05 23:38:05 +02:00
ThorstenB
c3f8c1478a tutorial submodule, part #2: adapt script/GUI to load module on demand
tutorial.nas is now loaded (only) when "Start Tutorial" button is pressed.
2011-06-05 21:37:58 +02:00
ThorstenB
f082300e20 Tutorial improvements
Make tutorial dialog a proper window, clean-up menu.
Show welcome message to new user when tutorial available.
Repeat current tutorial message, when no user progress.
2011-06-02 19:11:05 +02:00
Durk Talsma
ecfc088a4f Merge commit 'refs/merge-requests/95' of git://gitorious.org/fg/fgdata into merge-requests/95 2011-06-02 09:26:11 +02:00