mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,134 Commits 6 Branches 74 Tags 84 MiB
0de4d7924c
Commit Graph

1242 Commits

Author SHA1 Message Date
Armin Novak
38be366a67 Fixed generation of configure header, now replacing date fields 
with current date.
Added CMake script to generate a variable containing the current
date.
Removed last argument (the terminating NULL element) from output.
 2013-08-06 11:54:37 +02:00
Armin Novak
3fa1407c09 Removed extended text field. 2013-08-06 11:54:37 +02:00
Armin Novak
9295838f81 Added simple converter generating docbook XML from command line 
argument struct.
Modified xfreerdp.1.xml to include generated documentation.
Modified CMake to regenerate manpages correctly using the generator.
 2013-08-06 11:54:37 +02:00
Marc-André Moreau
ecc543d87d Merge branch 'master' of github.com:FreeRDP/FreeRDP into multitouch 2013-08-03 16:22:09 -04:00
Marc-André Moreau
68b254014e xfreerdp: fix cursor hidding/showing with multitouch 2013-08-03 16:13:39 -04:00
Daryl Poe
8b621518b6 careful with passwd in compatibility.c 
(cherry picked from commit a4a5baf0da)
 2013-07-30 14:11:29 +02:00
Marc-André Moreau
fdcf3a75be wfreerdp: fix build warnings 2013-07-26 15:43:55 -04:00
Benoît LeBlanc
03a401b8e6 CMakelists: 
disabled installation of headers and libraries for the wayk client.
 2013-07-25 21:59:21 -04:00
Benoît LeBlanc
a69390403b Merge branch 'master' of https://github.com/awakecoding/FreeRDP 2013-07-25 15:53:12 -04:00
C-o-r-E
e7b0d18b9b xfreerdp: comment cleanup 2013-07-23 14:47:40 -04:00
Benoît LeBlanc
81626c8741 MacFreeRDP cli fixes: 
- added ErrorInfo handling.
- Showing alert message on main thread.
- Autorelease pool for background thread.
 2013-07-22 15:33:30 -04:00
Benoît LeBlanc
e063a5cbcb MacFreeRDP: Fixed deployment paths, deploying missing winpr folder to framework structure. 
#####################

IMPORTANT:

To compile an Mac application using the MacFreeRDP framework, the developer MUST specifically add the framework's Headers folder to the Headers Search Path in the application's Build Settings.

e.g. /Users/Username/Documents//FreeRDP/build/client/Mac/Debug/MacFreeRDP.framework/Headers
 2013-07-22 12:38:15 -04:00
Benoît LeBlanc
20d3518c6b - MRDPView: rdpConnectError moved outside of the Framework, to the native App (in AppDelegate) This is now handled on the client side. 
- freerdp_connect: all code paths now trigger a ConnectionResult event.
 2013-07-19 16:33:20 -04:00
Benoît LeBlanc
2d90d5bb81 FreeRDP client: turned on setting to only write modified values to RDP file. 2013-07-19 10:18:33 -04:00
Benoît LeBlanc
d0a1563cb9 Fixed deadlock when closing session window. 2013-07-18 21:22:41 -04:00
Benoît LeBlanc
bbfdb853f6 MacFreeRDP: connection now starts asynchronously. 
Replaced RunLoop implementation with standard pthreads.
 2013-07-18 15:41:28 -04:00
C-o-r-E
b0437473f6 merged from upstream 2013-07-17 16:44:27 -04:00
Benoît LeBlanc
87b63aa0b2 MacFreeRDP: non-blocking connect 2013-07-17 16:04:55 -04:00
Benoît LeBlanc
83c69da98c MacFreeRDP: cleanup 2013-07-17 11:06:41 -04:00
Marc-André Moreau
67b972a021 mfreerdp: fix cursor rendering 2013-07-16 14:44:49 -04:00
Benoît LeBlanc
22b6878307 Custom cursor now visible on mac version. Cursor is now associated with NSView for automatic tracking area handling. 
Makefile: updated post-build  NIB file generation events to apply to all generators for Mac Client.
 2013-07-16 12:16:44 -04:00
Marc-André Moreau
fe62e8c69b Merge branch 'master' of github.com:mrthebunny/FreeRDP 2013-07-15 17:14:20 -04:00
Benoît LeBlanc
43231f9b40 Merge branch 'master' of git://github.com/awakecoding/FreeRDP 
# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  channels/rdpei: fix multitouch with Word 2013
  libfreerdp-client: use PubSub for OnChannelConnected/OnChannelDisconnected
  channels/disp: update
  client: add option for MS-RDPEDISP (/disp)
  channels/disp: initial RDP8.1 MS-RDPEDISP implementation
 2013-07-15 10:18:27 -04:00
C-o-r-E
89788e154f fixed CLI issue with /gestures 2013-07-11 17:59:20 -04:00
Benoît LeBlanc
44ead029f7 MacFreeRDP: fixed incorrect invalidation region that caused "tiles". Removed unused variables. 2013-07-11 11:19:21 -07:00
Marc-André Moreau
5926fa36dd libfreerdp-client: use PubSub for OnChannelConnected/OnChannelDisconnected 2013-07-11 08:53:15 -07:00
Marc-André Moreau
b93898e5ec client: add option for MS-RDPEDISP (/disp) 2013-07-09 16:10:59 -04:00
Benoît LeBlanc
f9bac0fce9 Added public API function 
freerdp_client_write_connection_file()

For now, all settings are written to the RDP file. This can be switched with the WRITE_ALL_SETTINGS define in file.c
 2013-07-05 23:20:56 -04:00
Benoît LeBlanc
d72452b4f5 Merge branch 'master' of git://github.com/awakecoding/FreeRDP 
# By Bernhard Miklautz (4) and others
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: fix unused variable
  libfreerdp-codec: add bitmap encoder
  cmdline: unix/windows return detected error
  client/common: fixed command line parsing issue
  channels/serial: bring it back to life
  nla: invalidate sec handle after creation
  tls: updated certificate mismatch message
 2013-07-05 16:35:08 -04:00
Marc-André Moreau
5f4f3af98a Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-07-04 20:33:00 -04:00
Benoît LeBlanc
c17c2f811b FreeRDP: 
- replaced char* by const char* in function prototypes
- MacFreeRDP: moved assignation of context function pointers
- freerdp: added more pointer and return value validations to prevent crashes
 2013-07-04 14:42:40 -04:00
Benoît LeBlanc
ea4ad89f09 Merge branch 'master' of git://github.com/awakecoding/FreeRDP 
# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  freerdp: separate GatewayUsageMethod from GatewayEnabled
 2013-07-03 15:07:35 -04:00
Marc-André Moreau
bc631c93a8 freerdp: separate GatewayUsageMethod from GatewayEnabled 2013-07-03 15:07:12 -04:00
Bernhard Miklautz
450b64ee73 cmdline: unix/windows return detected error 2013-07-03 16:44:06 +02:00
Bernhard Miklautz
df2aab92c0 client/common: fixed command line parsing issue 
fixes #1333
 2013-07-03 16:41:26 +02:00
Benoît LeBlanc
13a9de2b7a Merge branch 'master' of git://github.com/awakecoding/FreeRDP 
# By Bernhard Miklautz (14) and others
# Via Marc-André Moreau (10) and others
* 'master' of git://github.com/awakecoding/FreeRDP: (40 commits)
  xfreerdp: improve selection between multitouch and non-multitouch devices with XInput 2
  cache and core: set pointer to NULL after free
  pointer cache: fixed double free
  freerdp-client: use 32bpp with NSCodec
  libwinpr-utils: fix deadlock in PubSub
  utils/profiler: fix unix build
  utils: fix broken stopwatch implementation
  Android: various bug fixes to prevent NullPointerExceptions
  client/x11: fixed incorrect size calculation
  libfreerdp-utils/pcap: open pcap in binary mode
  libwinpr-synch: fix broken USleep (on WIN32)
  sample server: support build on win32
  server/sample: fix for issue #1312 (mstsc protocol error)
  fixed incorrect size calculation
  libfreerdp-common: add some null pointer checks.
  libfreerdp-codec/rfx: fix a memory leak.
  winpr/alignment: use size_t instead of UINT32
  Assorted tsmf and gstreamer fixes:
  winpr: offset support in _aligned_offset_malloc
  xfreerdp-server: removed binary
  ...
 2013-07-02 16:13:58 -04:00
Benoît LeBlanc
96b9972307 MacFreeRDP: fixed crash when opening second session 
(unrecognized selector sent to instance … )
 2013-07-02 16:13:43 -04:00
Marc-André Moreau
c084e0f8ae xfreerdp: improve selection between multitouch and non-multitouch devices with XInput 2 2013-06-28 13:46:58 -04:00
Marc-André Moreau
863b51f938 freerdp: merge with master 2013-06-28 12:50:24 -04:00
C-o-r-E
e85d793aa9 fixed initialization of xf_input 2013-06-27 20:26:31 -04:00
C-o-r-E
53b0d906af input: fixed screen not refreshing on scaling change 2013-06-27 19:16:13 -04:00
C-o-r-E
1e085197a9 some additional cleanup 2013-06-27 17:16:55 -04:00
Marc-André Moreau
1d0a579590 freerdp-client: use 32bpp with NSCodec 2013-06-27 15:39:56 -04:00
C-o-r-E
51a63db00b xfreerdp: added event handler for ScalingFactorChange 2013-06-27 15:07:40 -04:00
C-o-r-E
6f3cc12b2c fixed deadlock in pubsub, remove scale from xf_context 2013-06-27 14:24:46 -04:00
Benoît LeBlanc
6621239946 Merge branch 'master' of git://github.com/awakecoding/FreeRDP 
# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  freerdp: add new events for scaling and panning changes
  xfreerdp: add ParamChange event handler
  freerdp: add more settings for window panning and scaling
  winpr: add _WINRT platform detection macro
 2013-06-27 11:24:51 -04:00
Benoît LeBlanc
0f24f6490e MacFreeRDP - Replaced MRDPView instance in NIB with instance allocated by the API. 2013-06-27 11:22:15 -04:00
C-o-r-E
27cb96e577 work in progress 2013-06-27 03:59:49 -04:00
C-o-r-E
ebdf1ea6a2 picked some changes from awakecoding's branch 2013-06-26 21:56:37 -04:00
C-o-r-E
11b0a9f185 xfreerdp-client: attempted fixing build 2013-06-26 19:16:28 -04:00
Marc-André Moreau
c8a09f3f76 xfreerdp: add ParamChange event handler 2013-06-26 18:57:16 -04:00
Benoît LeBlanc
ed4a25d1ae WaykClient (Mac): integrated MRDPView (allocated at runtime) 2013-06-26 13:45:12 -04:00
Martin Fleisz
77f8ca315e Android: various bug fixes to prevent NullPointerExceptions 2013-06-26 06:50:10 -07:00
Bernhard Miklautz
03f2b7ea51 client/x11: fixed incorrect size calculation 
xf_Bitmap_Decompress used the same calculation like gdi_Bitmap_Decompress
see #1310
 2013-06-26 14:35:49 +02:00
C-o-r-E
340c3a4246 merged completely (painful) from awakecoding's tree 2013-06-25 20:41:32 -04:00
C-o-r-E
90c536de94 picked some changes from awakecoding tree 2013-06-25 18:47:41 -04:00
Benoît LeBlanc
44034305d3 Fixed output path for MacFreeRDP framework deployment. 
MRDPView: replaced awakeFromNib with viewDidLoad
 2013-06-25 16:05:37 -04:00
Marc-André Moreau
1fdcf5354c mfreerdp: change output name 2013-06-23 00:18:55 -04:00
Marc-André Moreau
3d479448a3 mfreerdp: refactoring 2013-06-22 22:55:51 -04:00
Marc-André Moreau
bda3a7e9cc mfreerdp: cleanup 2013-06-22 20:27:23 -04:00
Marc-André Moreau
bff4e22547 mfreerdp: remove cmake debug output 2013-06-22 18:38:35 -04:00
Benoît LeBlanc
1648ca2917 AsyncInput implementation. 
WARNING: settings->AsyncInput intentionnally left at FALSE, because the input callback function does not seem to be triggered after a certain point. Possibility of a deadlock?
 2013-06-20 20:55:49 -04:00
Benoît LeBlanc
7185c8a8fe mac client: Set clipboard redirection ON by default, small refactoring 2013-06-20 16:45:27 -04:00
Benoît LeBlanc
f24e6a2c3a mac client: async channels implementation 2013-06-20 15:00:50 -04:00
Benoît LeBlanc
57d99af6fd Mac client: removed non-async transport methods 2013-06-20 11:47:28 -04:00
Benoît LeBlanc
5a8318022d Fixed typo (AsyncChannels) 2013-06-20 10:42:11 -04:00
Benoît LeBlanc
19717162f0 mac client: implemented async update 
Activated async transport, channels
Removed duplicate rdpClientContext definition
 2013-06-20 10:03:20 -04:00
C-o-r-E
20dc2fc968 xfreerdp-client: made MultiTouchGestures CLI option 2013-06-19 18:43:24 -04:00
Benoît LeBlanc
ef49121db9 Merge git://github.com/awakecoding/FreeRDP 2013-06-19 10:33:51 -04:00
C-o-r-E
8a81730ff9 xfreerdp-client: initialize initialized initially 2013-06-18 21:52:05 -04:00
C-o-r-E
dd57bcbee8 xfreerdp-client: fixed input being initialized multiple times. Pan gesture now handled externally 2013-06-18 21:17:18 -04:00
Marc-André Moreau
90ce8be9fc freerdp-core: added Terminate event 2013-06-18 16:55:23 -04:00
Benoît LeBlanc
04d471a063 Release resources 2013-06-18 15:33:18 -04:00
Benoît LeBlanc
8dfd4075e9 mac client: moved command-line parsing and context alloc from library to app 2013-06-18 14:30:21 -04:00
Benoît LeBlanc
3541ecb2ff Mac client: close app on window close. Renamed header. 2013-06-18 12:03:22 -04:00
Benoît LeBlanc
aed02baf89 Merge git://github.com/awakecoding/FreeRDP 2013-06-18 11:03:57 -04:00
Marc-André Moreau
cc5b471f75 Merge branch 'master' of github.com:awakecoding/FreeRDP 2013-06-18 00:40:09 -04:00
Marc-André Moreau
508bae674b libwinpr-utils: improve PubSub with automatic strongly-typed helpers 2013-06-18 00:39:48 -04:00
Marc-André Moreau
69e8d150e0 xfreerdp: improve multitouch debug output 2013-06-17 22:22:16 -04:00
Marc-André Moreau
d006891207 xfreerdp: implement XInput 2.2 mouse pointer events 2013-06-17 21:54:38 -04:00
Benoît LeBlanc
0244326517 DotNetClient cmake scripts (incomplete) 2013-06-17 21:22:11 -04:00
Benoît LeBlanc
bc83a8700c mac client: cleanup, removed RAIL, global var 2013-06-17 21:21:42 -04:00
Benoît LeBlanc
307a2eb3f3 mac client: cleanup, removed RAIL, global variable 2013-06-17 21:20:56 -04:00
Benoît LeBlanc
45de8d4d14 Refactoring Mac app - update API, stripped RAIL code 2013-06-17 16:44:44 -04:00
Benoît LeBlanc
a5c57e1bfb Merge git://github.com/awakecoding/FreeRDP 
Latest updates from master branch (PubSub)
 2013-06-17 09:21:56 -04:00
Marc-André Moreau
b55725487f wfreerdp: fix basic connectivity 2013-06-16 00:51:48 -04:00
Marc-André Moreau
c76efec345 wfreerdp: update client with new API 2013-06-15 22:57:21 -04:00
Marc-André Moreau
59b7c53c5f freerdp: remove temporary rdpClient* interface and replace with pubSub hooks 2013-06-15 17:39:45 -04:00
Marc-André Moreau
6c9a3b8e64 freerdp: start using pubSub for client GUI events 2013-06-15 17:01:10 -04:00
Marc-André Moreau
95a129eb69 libfreerdp-client: start splitting termination and printing logic for CLI parsing 2013-06-15 15:13:38 -04:00
Marc-André Moreau
b5bb3619b8 xfreerdp: rename xf_interface.h to xf_client.h 2013-06-15 13:41:05 -04:00
C-o-r-E
0c46350ccd xfreerdp-client: fixed pan gesture 2013-06-14 18:02:45 -04:00
Benoît LeBlanc
1910205d06 Refactoring - mac platform 2013-06-14 16:19:03 -04:00
Benoît LeBlanc
2c7079cd57 Merge git://github.com/awakecoding/FreeRDP 
Updated from master branch
 2013-06-14 15:12:36 -04:00
Marc-André Moreau
010f1dfdd9 xfreerdp: add rdpClientContext common section 2013-06-14 15:07:17 -04:00
Benoît LeBlanc
fb92750a4f Revert "Updating common API" 
This reverts commit 85a4eb2996.
 2013-06-14 10:00:19 -04:00
Marc-André Moreau
a8c268a9ff xfreerdp: improve common client API 2013-06-13 22:11:23 -04:00
Marc-André Moreau
208c9f844a freerdp: fix core API bugs 2013-06-13 21:34:46 -04:00
Marc-André Moreau
3f25a5dea3 xfreerdp: refactor simplified client API to offer a single entry point 2013-06-13 20:25:50 -04:00
Marc-André Moreau
8eaa32ac8f xfreerdp: merge with benoit's client API update 2013-06-13 17:52:24 -04:00
Benoît LeBlanc
115b3978c6 Updating common API 2013-06-13 16:18:19 -04:00
Benoît LeBlanc
85a4eb2996 Updating common API 2013-06-13 16:18:08 -04:00
Benoît LeBlanc
dc3ca67b2b Merge git://github.com/awakecoding/FreeRDP 
Merging Marc-André's latest changes
 2013-06-13 10:28:32 -04:00
Bernhard Miklautz
8748cfc57f Added auth-only parameter to new command line syntax 
auth-only only authenticates. This can be used for credential testing.
Username and password are required for auth-only
 2013-06-13 14:51:25 +02:00
Bernhard Miklautz
ce17a827c4 Added play-rfx command line option. 
PCAP dumps can now be played with /play-rfx:path_to_file again.
 2013-06-13 14:51:25 +02:00
Marc-André Moreau
bb78fb16f8 xfreerdp: refactor to make use of single xfContext* and remove xfInfo* 2013-06-12 18:57:25 -04:00
Benoît LeBlanc
2a13b94715 pulled last changes from Marc-André 2013-06-12 16:17:41 -04:00
Marc-André Moreau
a54d0edcc1 xfreerdp: merge redundant xfInfo and xfContext structures 2013-06-12 15:41:30 -04:00
Marc-André Moreau
3317592ecb channels/rdpei: fix long press (multitouch right-click) 2013-06-11 16:15:46 -04:00
C-o-r-E
ac544a0718 Merge branch 'master' of https://github.com/C-o-r-E/FreeRDP 2013-06-11 15:01:17 -04:00
C-o-r-E
4e5da7f67c xfreerdp-client: improved pan gesture responce 2013-06-11 15:01:08 -04:00
Benoît LeBlanc
42f7c7f6b2 Static buid for Mac OS X, mf_interface, WITH_VERBOSE option 
mf_interface is still in progress
 2013-06-11 14:56:43 -04:00
C-o-r-E
1640652ee0 core: added OnPan, xfreerdp: modified special keys 2013-06-10 19:52:16 -04:00
C-o-r-E
e4dfa00c27 xfreerdp-client: exposed scaling API 2013-06-06 19:44:29 -04:00
Marc-André Moreau
7c877e1a61 channels/rdpei: restructure 2013-06-06 18:14:59 -04:00
C-o-r-E
e72b79940c merged upstream 2013-06-05 14:59:24 -04:00
C-o-r-E
27c1a73836 xfreerdp-client: temporarily allow +xy panning 2013-06-05 13:59:34 -04:00
Marc-André Moreau
2bd6808432 freerdp: merge with master 2013-06-05 10:31:01 -04:00
C-o-r-E
f6b9fa53ff xfreerdp-client: fixed potential crash 2013-06-03 17:53:06 -04:00
martijn-m
151c4504b1 Translate new stubs for dutch strings 2013-06-01 11:09:21 +02:00
C-o-r-E
bbfde8a410 xfreerdp-client: stability++ for gestures 2013-05-31 17:07:51 -04:00
Marc-André Moreau
e9edd489df mfreerdp: fix build on Mac OS X 2013-05-31 15:45:55 -04:00
Marc-André Moreau
fd1b5a448f Merge branch 'master' of git://github.com/mrthebunny/FreeRDP 2013-05-31 14:58:10 -04:00
Marc-André Moreau
b753feab3d mfreerdp: fix monolithic build 2013-05-31 14:57:48 -04:00
Benoit LeBlanc
bda6acbf3f Updated with changes from awakecoding repository. 2013-05-31 14:54:15 -04:00
Benoit LeBlanc
d1598f14be Added focus handling on WM_ACTIVATE 2013-05-31 14:20:43 -04:00
Marc-André Moreau
69706b507e cmake: fix 32-bit clang with SSE 2013-05-31 13:51:50 -04:00
C-o-r-E
f437fefe38 xfreerdp-client: improved gesture responce, clean up 2013-05-31 13:48:53 -04:00
Marc-André Moreau
12a46784dd mfreerdp: integrate benoit's refactored mac client 2013-05-31 12:48:40 -04:00
C-o-r-E
d5400152d1 freerdp-client: improve pan gesture 2013-05-30 16:04:31 -04:00
C-o-r-E
a7048105ad freerdp-client: initial pan gesture logic 2013-05-30 14:36:13 -04:00
C-o-r-E
cdc294003d freerdp-client: formatting 2013-05-30 09:27:20 -04:00
Martin Fleisz
57318db1c3 Merge pull request #1264 from mfleisz/and_xlarge 
Android: support xlarge screens
 2013-05-29 08:38:35 -07:00
C-o-r-E
5820c24b03 freerdp-client: expose panning offsets 2013-05-28 20:34:40 -04:00
C-o-r-E
ccc31f9843 freerdp-client: fix expose issue 2013-05-28 19:47:23 -04:00
C-o-r-E
5ba3e18157 freerdp-client: fix render reset 2013-05-28 17:51:02 -04:00
C-o-r-E
284f54ffcd freerdp-client: fix input coord translation 2013-05-28 16:28:13 -04:00
C-o-r-E
c6049f7628 freerdp-client: fix reset scale when offsets are used 2013-05-28 14:32:49 -04:00
C-o-r-E
17fd2dcbfa Merge remote-tracking branch 'upstream/master' 2013-05-27 19:50:19 -04:00
Marc-André Moreau
9d3ec97f9e freerdp: fix monolithic build with Xcode 2013-05-24 18:38:02 -04:00
Martin Fleisz
6f95ddb658 Android: support xlarge screens 2013-05-24 01:42:06 -07:00
Martin Fleisz
ecacc07d04 Android: Add missing stubs for dutch strings 2013-05-22 06:22:04 -07:00
Martin Fleisz
0f0aadae94 Android: Added spanish and dutch translation stubs 2013-05-22 05:18:37 -07:00
Bernhard Miklautz
ba4182566c Merge pull request #1259 from mfleisz/tsgshutdown 
libfreerdp-core: Added support for server initiated shutdown to TSG
 2013-05-22 02:12:51 -07:00
Bernhard Miklautz
91380255c9 Merge pull request #1258 from mfleisz/rfxbmpv3fix 
Android/iOS: Fixes for using RemoteFX with Bitmap Cache V3
 2013-05-22 02:11:52 -07:00
Bernhard Miklautz
415c0c4467 Merge pull request #1254 from mfleisz/iospwfix 
iOS: Fixed password storage on higher iOS versions
 2013-05-22 02:11:24 -07:00
Martin Fleisz
120960fd4d libfreerdp-core: Added support for server initiated shutdown to TSG 2013-05-22 10:58:11 +02:00
Martin Fleisz
f2aea91ccf Android/iOS: Fixes for using RemoteFX with Bitmap Cache V3 2013-05-22 01:48:43 -07:00
C-o-r-E
4c4622aac7 xfreerdp-client: fixed build on OS X 2013-05-21 20:16:14 -04:00
Martin Fleisz
583938dcb8 iOS: Fixed password storage on higher iOS versions 2013-05-21 15:42:49 +02:00