Marc-André Moreau
bd516e04fa
libfreerdp-primitives: cleanup YCoCg
2014-09-06 21:13:37 -04:00
Marc-André Moreau
f14b0e0195
libfreerdp-codec: cleanup h264 decoder
2014-09-05 19:11:03 -04:00
Marc-André Moreau
033e75467b
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
2014-09-05 17:29:35 -04:00
Marc-André Moreau
66bbbf0519
libfreerdp-gdi: enable altsec frame markers
2014-09-05 16:06:19 -04:00
Marc-André Moreau
5107f07b52
Merge pull request #2057 from ptsekov/software-gdi-improvements
...
Adjust the X11 code to work with the new GDI color
2014-09-05 15:05:53 -04:00
Pavel Tsekov
cdfcbeff5c
X11: Convert GDI color to X11 color troughout.
...
* client/X11/xf_client.c (xf_pre_connect): Set the field `colormap' of
`struct xfContext' to the default colormap.
* client/X11/xfreerdp.h (xf_gdi_get_color): Declare new external function.
* client/X11/xf_gdi.c (xf_gdi_get_color): Define new external function.
Use xf_gdi_get_color() to get the appropriate X color index from the GDI
color representation.
* client/X11/xf_graphics.c: Likewise.
2014-09-04 12:44:03 +03:00
Marc-André Moreau
1491c5a7f9
libfreerdp-codec: initial partial upgrade tile support
2014-09-02 19:25:01 -04:00
erbth
25593c7250
H.264: converting only clipping rects to XRGB
2014-09-02 22:16:56 +02:00
Marc-André Moreau
656dd760c5
libfreerdp-codec: fix sub-band diffing
2014-08-26 16:15:22 -04:00
Marc-André Moreau
ec53dd612e
libfreerdp-codec: fix progressive codec tile drawing offset, fix dequantization
2014-08-25 19:50:42 -04:00
Pavel Tsekov
08d60d01e0
Adjust the code to work with the new GDI color
...
representation.
* client/X11/xf_gdi.c:
Use freerdp_color_convert_drawing_order_color_to_gdi_color() to convert
from drawing order color representation to GDI color representation
troughout.
* client/X11/xf_graphics.c: Likewise.
2014-08-21 03:35:34 +03:00
Daniel Bungert
27fc3ee64d
Fix multiple cases of use of uninitialized vars
...
* Zeroing xevent helped address some erratic behavior.
* valgrind complained about using xfBitmap uninitialized
during shutdown, traced it back to the initialization.
Bitmap_Prototype->size > sizeof(rdpBitmap).
* Early exit from recv_tpkt_pdu is necessary to address
a shutdown crash - the channelId value was being used
without being set in the disconnect case.
2014-08-20 03:54:05 -06:00
Marc-André Moreau
68b3d0476b
libfreerdp-codec: start work on progressive inverse DWT
2014-08-19 14:48:09 -04:00
Marc-André Moreau
1a8c763309
Merge branch 'shadow' of github.com:awakecoding/FreeRDP
2014-08-18 17:06:13 -04:00
Ron Yaari
1b819067b0
X11: fix toggle-fullscreen option functionality
2014-08-18 10:41:40 +03:00
Idan Freiberg
27f5eaba88
Revert "X11: fix toggle-fullscreen option functionality"
...
This reverts commit 0c84c81401
.
2014-08-18 10:39:47 +03:00
Ron Yaari
0c84c81401
X11: fix toggle-fullscreen option functionality
2014-08-18 10:19:47 +03:00
Norbert Federa
3c8700f62d
Merge pull request #1963 from akallabeth/async-update-to-lib
...
Moved update thread from client to library.
2014-08-14 17:46:43 +02:00
erbth
095a7aba99
OpenH264 YUV data conversion with intel SSSE3 in assembly
2014-08-13 20:56:40 +02:00
Marc-André Moreau
e4a4aa4d3a
Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
...
Conflicts:
channels/encomsp/client/encomsp_main.c
libfreerdp/core/tcp.c
libfreerdp/crypto/certificate.c
server/Windows/CMakeLists.txt
server/X11/xf_cursor.c
server/X11/xf_input.c
server/X11/xf_interface.c
server/X11/xf_monitors.c
server/X11/xf_peer.c
2014-08-11 19:22:33 -04:00
Marc-André Moreau
cff9c16c1e
Merge branch 'master' of github.com:FreeRDP/FreeRDP
...
Conflicts:
channels/disp/client/disp_main.c
2014-08-11 10:36:07 -04:00
Marc-André Moreau
067da290dd
Merge pull request #2027 from akallabeth/winpr-log
...
Replace stdout and logging defines with WLog, add logcat support
2014-08-11 10:38:28 -04:00
erbth
a8257b5201
fixed some memory leaks arround DVC and RDPEGFX
2014-08-08 15:19:49 +02:00
Armin Novak
0780c0993e
Replaced fprintf(stderr with DEBUG_WARN
2014-08-07 22:21:07 +02:00
Marc-André Moreau
3895c930a3
Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
2014-08-05 09:56:12 -04:00
erbth
64501b895b
Merge branch 'egfx' of https://github.com/awakecoding/freerdp into egfx
...
Conflicts:
libfreerdp/codec/h264.c (deleted in my repo in order to get complete remote file)
2014-07-30 13:11:05 +02:00
erbth
20e76411dc
H.264 hack and first port of YUV to XRGB format conversion to assembly
2014-07-29 21:42:04 +02:00
Marc-André Moreau
a3de93d867
libfreerdp-codec: start parsing progressive codec
2014-07-28 23:41:16 -04:00
Marc-André Moreau
780079d629
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
2014-07-28 16:59:29 -04:00
Daryl Poe
3794720455
correct Pause key sequence
...
(cherry picked from commit 46a00b5c9e
)
2014-07-25 11:31:50 +02:00
erbth
9501b6c58e
OpenH264 first frame decode fix
2014-07-17 16:25:34 +02:00
Marc-André Moreau
e7fb6e67f5
shadow: add basic lobby functionality
2014-07-14 18:01:29 -04:00
Armin Novak
689902c995
Moved update thread from client to library.
2014-07-14 19:27:50 +02:00
Armin Novak
ad3255354d
Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without
...
SOVERSION information. (required by Android)
2014-07-11 11:53:58 +02:00
Bernhard Miklautz
6a49bcfe40
winpr: always build "monolitic"
...
winpr is now always build as single library.
The build option MONOLITHIC_BUILD doesn't influence this behavior anymore.
The only exception is winpr-makecert-tool which is still build as extra
library.
This obsoletes complex_libraries for winpr.
2014-07-10 11:10:58 +02:00
Marc-André Moreau
03c91a92d1
libfreerdp-codec: add more egfx h264 debugging
2014-07-09 16:41:36 -04:00
Marc-André Moreau
10f8a0a45b
xfreerdp: start using regionRects in egfx h264 decoding
2014-07-08 18:04:24 -04:00
Marc-André Moreau
6f1acb01dd
channels/rdpgfx: parse H264 bitmap stream and meta block
2014-07-08 17:37:29 -04:00
Marc-André Moreau
ac7d23b9a3
libfreerdp-gdi: migrate to _aligned_malloc/_aligned_free
2014-07-08 15:07:19 -04:00
Marc-André Moreau
c16000e67b
Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
2014-07-08 12:29:30 -04:00
Marc-André Moreau
8516846999
libfreerdp-client: cleanup gfx options
2014-07-08 12:29:08 -04:00
Norbert Federa
196330111b
xfreerdp: xfixes selection ownership notification
...
The X11 core protocol does not have support for selection ownership
notifications. Until now xfreerdp worked around this issue by always sending
a format list pdu to the server after sending the format data response pdu
which makes the server side think that the clients clipboard data has changed.
This workaround has some severe drawbacks:
* it causes unnecessary data transfers because even without local clipboard
data changes the same data is always re-transferred over the channel
* with some clipboard managers (in the server sessions) you will get massive
endless data transfer loops because these managers immediately request the
data on clipboard changes.
The correct (core X11) way would be polling for selection ownership changes
which must include the ability to detect changes to the TIMESTAMP target if
the selection owner did not change.
The alternative to the poll based approach is using the X Fixes extension in
order to get selection ownership notifications.
This commit adds support for the XFIXES solution and also moves the complete
clipboard related event handling from xf_event.c to xf_cliprdr.c
2014-07-07 20:31:23 +02:00
Marc-André Moreau
bde954107d
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
...
Conflicts:
client/X11/xf_gfx.c
2014-07-03 12:03:39 -04:00
Mike McDonald
4d3d78c487
Initial implementation of H.264 decoder for MS-RDPEGFX
2014-07-01 23:28:09 -04:00
Marc-André Moreau
4a4f4308b5
libfreerdp-codec: improve ClearCodec error checking
2014-07-01 16:32:36 -04:00
Marc-André Moreau
f304d8cc20
libfreerdp-codec: more ClearCodec vBar caching
2014-07-01 14:38:54 -04:00
Marc-André Moreau
8a5591bdef
libfreerdp-codec: add ClearCodec glyph cache
2014-07-01 09:55:52 -04:00
Marc-André Moreau
78e00db45d
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
...
Conflicts:
libfreerdp/codec/test/TestFreeRDPCodecClear.c
2014-07-01 09:11:50 -04:00
Marc-André Moreau
ff816feb72
Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
2014-07-01 09:01:52 -04:00
Marc-André Moreau
e42465372a
xfreerdp: initial remote assistance controls (ctrl+alt+c to request/release control)
2014-06-30 17:17:06 -04:00
Marc-André Moreau
49cd7806d9
libfreerdp-codec: improve ClearCodec decompressor
2014-06-26 17:08:51 -04:00
Marc-André Moreau
dd36617093
libfreerdp-codec: improve clear_decompress function parameters
2014-06-25 18:39:28 -04:00
Marc-André Moreau
c20c3abdf1
xfreerdp: fix egfx SurfaceToSurface off-by-one
2014-06-25 18:00:48 -04:00
Marc-André Moreau
95a0d96b58
xfreerdp: fix build warnings
2014-06-23 12:08:34 -04:00
Marc-André Moreau
78d3c82798
xfreerdp: fix multiple egfx-related memory leaks
2014-06-20 13:52:13 -04:00
Marc-André Moreau
ce6ff35297
xfreerdp: fix egfx off-by-one errors
2014-06-19 17:08:50 -04:00
Marc-André Moreau
160a3c4b61
libfreerdp-codec: avoid intermediate copy with planar egfx
2014-06-19 13:55:34 -04:00
Marc-André Moreau
57b0e4d010
libfreerdp-codec: handle flipping in planar decompression
2014-06-19 13:08:07 -04:00
Marc-André Moreau
425763d30a
libfreerdp-codec: start offering more flexible planar codec decompression
2014-06-17 16:44:24 -04:00
Marc-André Moreau
d69316198f
xfreerdp: add egfx support for planar codec
2014-06-17 16:15:30 -04:00
Marc-André Moreau
61eb7f2f8e
libfreerdp-codec: fix ClearCodec decoding
2014-06-13 17:30:13 -04:00
Marc-André Moreau
eeb7cd2cb2
xfreerdp: initial egfx bitmap caching
2014-06-13 08:36:09 -04:00
Marc-André Moreau
27b1e76dbb
xfreerdp: fix egfx SurfaceToSurface overlapping copies
2014-06-12 21:02:25 -04:00
Marc-André Moreau
50883e6c83
xfreerdp: fix egfx RemoteFX bitmap updates
2014-06-12 18:23:51 -04:00
Marc-André Moreau
ae02b5b512
xfreerdp: start handling egfx surface-to-surface
2014-06-12 16:13:12 -04:00
Marc-André Moreau
42c83c25f8
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
...
Conflicts:
channels/tsmf/client/tsmf_main.c
2014-06-12 12:08:15 -04:00
Marc-André Moreau
6f9a256c5c
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
...
Conflicts:
channels/drdynvc/client/dvcman.c
client/X11/xf_client.c
include/freerdp/dvc.h
2014-06-12 12:03:08 -04:00
Marc-André Moreau
fbea223ecf
channels/gfx: add surface table helper, surface creation/deletion
2014-06-11 17:48:04 -04:00
Marc-André Moreau
2a82684521
channels: cleanup unused freerdp channels global functions
2014-06-11 16:27:31 -04:00
Armin Novak
4325741583
Merge remote-tracking branch 'origin/master' into tsmf-gstreamer-1.0
...
Conflicts:
client/X11/xf_client.c
2014-06-11 11:27:08 +02:00
Marc-André Moreau
161e7b0026
libfreerdp-codec: simplify zgfx segment processing
2014-06-05 14:52:27 -04:00
Marc-André Moreau
6ad00125b4
xfreerdp: avoid using XCopyArea
2014-06-05 13:13:47 -04:00
Marc-André Moreau
68221cca73
xfreerdp: improve gfx frame handling
2014-06-05 12:36:01 -04:00
Marc-André Moreau
38ac1fd7b0
xfreerdp: improve graphics pipeline support
2014-06-04 22:49:03 -04:00
Marc-André Moreau
12e6c845eb
channels/rdpgfx: cleanup debug output
2014-06-04 22:06:29 -04:00
Marc-André Moreau
f194a7b156
channels/rdpgfx: fix parsing of pdus in an array
2014-06-04 21:35:31 -04:00
Marc-André Moreau
83edc68422
xfreerdp: start integrating graphics pipeline
2014-06-04 18:03:25 -04:00
Marc-André Moreau
e11d7d967e
Merge pull request #1868 from akallabeth/x11_shutdown_fix
...
X11 aync input shutdown fix
2014-06-04 11:59:58 -04:00
Hardening
07e0eba7db
Check that bpp has reasonable value
...
As bpp is often used for malloc computations, let's check that it has
a reasonable value.
2014-05-29 10:12:02 +02:00
Armin Novak
2a6253ecfa
Abortion check now just tests for quit in the queue.
2014-05-27 09:32:58 +02:00
Armin Novak
7e481d31b2
Now processing input messages in async thread.
2014-05-26 22:54:34 +02:00
Armin Novak
0c77671a86
Fixed input_thread shutdown issue if not initiated by user.
2014-05-26 19:09:25 +02:00
Armin Novak
b1770c33fd
Now using posix shared memory with process specific identifier.
2014-05-23 13:09:11 +02:00
Armin Novak
78f9472b41
Removed tsmf.tid hack.
2014-05-23 13:08:22 +02:00
Armin Novak
248955da4c
Fixed memory leak in manpage generation script.
2014-05-23 13:07:37 +02:00
Marc-André Moreau
e9653519fb
xfreerdp: add proper OpenSSL include directory
2014-04-23 09:51:22 -04:00
Marc-André Moreau
784e9abd79
cmake: improve __FILE__ relative path hack
2014-04-21 14:42:24 -04:00
Marc-André Moreau
84cef49678
xfreerdp: treat Super key differently
2014-03-25 12:27:06 -04:00
Marc-André Moreau
25a7225a22
xfreerdp: don't execute action script when not present
2014-03-24 09:40:01 -04:00
Marc-André Moreau
234a3fa453
xfreerdp: add action script options for X11 events
2014-03-22 17:12:50 -04:00
Marc-André Moreau
770defc706
xfreerdp: add registration of key combinations
2014-03-22 14:40:52 -04:00
Marc-André Moreau
208085a894
xfreerdp: add ability to script key combinations
2014-03-14 00:11:44 -04:00
Marc-André Moreau
186172fa78
xfreerdp: cleanup keyboard code
2014-03-13 21:10:22 -04:00
Marc-André Moreau
f7bcdad775
Merge branch 'master' of github.com:awakecoding/FreeRDP into channels
2014-02-27 16:55:24 -05:00
Marc-André Moreau
c22490ec3b
xfreerdp: disable auto-reconnect by default, add command-line option
2014-02-27 16:55:07 -05:00
Marc-André Moreau
419e2936be
Merge branch 'master' of github.com:awakecoding/FreeRDP into channels
2014-02-27 15:09:06 -05:00
Marc-André Moreau
1afeb448b4
libfreerdp-core: expose stubbed WtsApi function table from the core
2014-02-16 20:12:45 -05:00
Marc-André Moreau
4bbd78a80b
libfreerdp-core: remove unnecessary usage of freerdp_channels_data
2014-02-15 15:26:34 -05:00
Dan Bungert
dd88d7194e
xfreerdp: Fix disappearing rail windows.
...
Rail windows currently disappear on resize and on implicit resize
(calc changing view type from standard to scientific).
The bitmask that we send to XCreateWindow() must match the actual
attributes that we are sending (see xf_create_window()).
Because of this we were unintentionally zeroing out some of the
window attributes rather than using their default values.
2014-02-12 16:22:18 -07:00
Marc-André Moreau
3782c2ad72
Merge branch 'master' of github.com:FreeRDP/FreeRDP
2014-01-25 16:34:34 -05:00
Marc-André Moreau
9a4fb396da
libwinpr-synch: add unit test for waitable timer asynchronous procedure calls
2014-01-24 18:08:06 -05:00
Marc-André Moreau
ae9c10e233
Merge pull request #1664 from vworkspace/auto-reconnect
...
Addition of auto reconnect to FreeRDP core and X11 client
2014-01-23 10:15:18 -08:00
Bernhard Miklautz
8392b1cc10
xfreerdp: handle negative mouse coordinates
...
If the pointer is moved out a window relatives coordinates can get negative
in X. This case wasn't handled.
fixed #1654
2014-01-22 15:20:17 +01:00
Mike McDonald
c4f6dcc24f
Added auto reconnect to FreeRDP core and X11 client
2014-01-16 17:38:56 -05:00
Marc-André Moreau
e7974090bb
freerdp: fix removal of OnParamChange event
2013-12-11 17:29:09 -05:00
Marc-André Moreau
eb20d0f770
freerdp: fix order of OrderSupport initialization
2013-12-10 12:30:25 -05:00
Marc-André Moreau
62199fc46a
Merge branch 'master' of github.com:FreeRDP/FreeRDP
2013-12-10 11:54:03 -05:00
ZhaoHongbo
1ce5e908eb
Fix some software can not normal work
2013-12-03 09:57:57 +08:00
Marc-André Moreau
5bcdab95ff
libfreerdp-codec: partial planar RLE compression support
2013-11-26 22:16:31 -05:00
Marc-André Moreau
1fc2d780f7
libfreerdp-core: fix memory leaks reported by valgrind
2013-10-31 23:35:24 -04:00
Marc-André Moreau
3bc47a2bf8
libfreerdp-core: fix leaks and potential use after free
2013-10-31 21:12:06 -04:00
Marc-André Moreau
55565e056c
freerdp: export targets
2013-10-28 23:06:39 -04:00
Marc-André Moreau
3cd5652c7d
libfreerdp-core: fix asynchronous queueing of RemoteApp messages
2013-10-22 16:28:23 -04:00
Marc-André Moreau
59eccac4e7
libfreerdp-client: refactor and decouple rdpSettings* from client context
2013-10-12 21:07:12 -04:00
Marc-André Moreau
518995a05e
freerdp: merge with master
2013-09-16 17:10:27 -04:00
Marc-André Moreau
336e47e82f
Merge pull request #1460 from akallabeth/thread_handle_fixes
...
Thread handle fixes
2013-09-16 13:40:32 -07:00
Bernhard Miklautz
b70835d73d
Merge pull request #1470 from bmiklautz/issue/773
...
x11/client: win8/server 2k12 fix for kbd sync
2013-09-16 03:15:53 -07:00
Bernhard Miklautz
a2ce481586
x11/client: win8/server 2k12 fix for kbd sync
...
Keyboard indicator sync (caps lock/num lock/..) didn't work properly
on reconnect for windows 8 and windows 2012 server.
fixes #773
2013-09-09 18:41:57 +02:00
Armin Novak
f399951031
Fixed input thread shutdown caused by previous commit.
2013-09-06 09:41:00 +02:00
Armin Novak
81a5e727d6
Added proper thread sync for input thread.
...
Channels thread now listening to message pipe quit signal posted
when shutting down the channel.
2013-09-06 09:02:46 +02:00
Marc-André Moreau
f790831e7d
Merge branch 'master' of github.com:awakecoding/FreeRDP into xrdp-ng
2013-09-05 15:23:19 -04:00
Armin Novak
f2bc161f13
Fixed duplicate WaitForSingleObject on client thread.
2013-09-05 14:44:35 +02:00
Armin Novak
4c1708e290
Fixed channel closing before waiting for thread to quit.
2013-09-05 14:36:06 +02:00
Armin Novak
8442c79e10
Added assertions and ExitThread calls.
2013-09-05 14:27:34 +02:00
Armin Novak
e5c138a5b9
Fixed various memory leaks, allocation size issues and API misuse
...
warnings shown by clang as well as some compiler warnings.
2013-09-05 12:14:34 +02:00
Armin Novak
a3b531c036
Fixed issues found with clang-analyzer
2013-09-05 12:14:33 +02:00
Armin Novak
1e2455fa4a
Fixed various memory leaks and compiler warnings.
2013-09-05 12:14:33 +02:00
Marc-André Moreau
7edfe66274
freerdp: various missing link dependencies and symbol exports
2013-09-03 21:48:26 -04:00
Marc-André Moreau
b480ce1830
freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers
2013-09-03 20:37:04 -04:00
Marc-André Moreau
ee36541fb7
freerdp: merge with master
2013-09-03 18:49:48 -04:00
Marc-André Moreau
e429136c0c
libwinpr-wtsapi: started internal RPC stubs
2013-08-23 00:06:22 -04:00
Armin Novak
2f20a8c12b
Fixed various memory leaks and resource deallocation problems.
2013-08-19 17:44:52 +02:00
Marc-André Moreau
0fd705c6c7
channels/cliprdr: start server-side implementation
2013-08-16 16:46:47 -04:00
Marc-André Moreau
3194967957
xfreerdp: fix monolithic build
2013-08-15 13:25:29 -04:00
Marc-André Moreau
87593b4f19
Merge branch 'master' of github.com:FreeRDP/FreeRDP
2013-08-15 13:16:05 -04:00
Marc-André Moreau
1e5118116d
libfreerdp-codec: start implementing split NSCodec encoder
2013-08-14 23:16:13 -04:00
Marc-André Moreau
b0b71ae9b1
Merge pull request #1394 from akallabeth/manpage_merged
...
Manpage merged
2013-08-14 06:56:27 -07:00
Marc-André Moreau
fe25303656
libfreerdp-codec: internal refactoring
2013-08-13 17:18:59 -04:00
Armin Novak
9b95c55574
Replaced xmlto with xsltproc to word around a bug preventing manpages
...
to be build, when there are spaces in the build path.
2013-08-06 15:02:36 +02:00
Armin Novak
ef574c0fcc
Added missing dependency for custom command generating manpage.
2013-08-06 12:40:48 +02:00
Armin Novak
6c676e8795
Removed placeholder for channel documentation until it is available.
2013-08-06 12:25:38 +02:00
Armin Novak
68511fc7d4
Added better formatting of commands in manpage.
2013-08-06 12:23:31 +02:00
Armin Novak
be37b91e3d
Minor adjustments in naming.
2013-08-06 11:54:37 +02:00
Armin Novak
e80effa2a8
Added examples with short description to manpage.
...
Added placeholder for channel documentation.
2013-08-06 11:54:37 +02:00
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
68b254014e
xfreerdp: fix cursor hidding/showing with multitouch
2013-08-03 16:13:39 -04:00
C-o-r-E
e7b0d18b9b
xfreerdp: comment cleanup
2013-07-23 14:47:40 -04:00
C-o-r-E
b0437473f6
merged from upstream
2013-07-17 16:44:27 -04:00