platform/upstream/freerdp.git
10 years agoCode cleanup
Benoît LeBlanc [Wed, 18 Dec 2013 17:44:40 +0000 (12:44 -0500)]
Code cleanup

10 years agoFixed WaitForSingleObject and WaitForMultipleObjects (timeouts incorrectly sets)...
Benoît LeBlanc [Tue, 17 Dec 2013 23:21:12 +0000 (18:21 -0500)]
Fixed WaitForSingleObject and WaitForMultipleObjects (timeouts incorrectly sets). Added detailed error reporting, better timeout error handling.

10 years agoFixed WaitForSingleObject and WaitForMultipleObjects (timeouts incorrectly sets)...
Benoît LeBlanc [Tue, 17 Dec 2013 23:20:33 +0000 (18:20 -0500)]
Fixed WaitForSingleObject and WaitForMultipleObjects (timeouts incorrectly sets). Added detailed error reporting, better timeout error handling.

10 years agoMerge branch 'master' of git://github.com/awakecoding/FreeRDP
Benoît LeBlanc [Tue, 17 Dec 2013 18:54:52 +0000 (13:54 -0500)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

10 years agolibwinpr-sspi: fix NTLM TargetName bug
Marc-André Moreau [Tue, 17 Dec 2013 16:51:13 +0000 (11:51 -0500)]
libwinpr-sspi: fix NTLM TargetName bug

10 years agochannels/rdpsnd: improve winmm rdpsnd implementation
Marc-André Moreau [Sun, 15 Dec 2013 20:59:51 +0000 (15:59 -0500)]
channels/rdpsnd: improve winmm rdpsnd implementation

10 years agofixed error parsing rdp file: lines without value were ignored before being marked...
Benoît LeBlanc [Fri, 13 Dec 2013 21:58:46 +0000 (16:58 -0500)]
fixed error parsing rdp file: lines without value were ignored before being marked as formatted, resulting in duplicate values being written to the RDP file afterwards.

10 years ago- added CANCELEDBYUSER error code.
Benoît LeBlanc [Fri, 13 Dec 2013 15:11:36 +0000 (10:11 -0500)]
- added CANCELEDBYUSER error code.
- AUTHENTICATIONERROR error code correclty set on gateway authentication (http error 401)
- Better error handling on connection errors and user cancelation

10 years agoMerge branch 'master' of git://github.com/awakecoding/FreeRDP
Benoît LeBlanc [Thu, 12 Dec 2013 20:06:51 +0000 (15:06 -0500)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

10 years agoFix: PromptCredentialsOnce / GatewayUseCredentials were always set to true regardless...
Benoît LeBlanc [Thu, 12 Dec 2013 16:32:36 +0000 (11:32 -0500)]
Fix: PromptCredentialsOnce / GatewayUseCredentials were always set to true regardless of the value present in the rdp file.

10 years agofreerdp: fix removal of OnParamChange event
Marc-André Moreau [Wed, 11 Dec 2013 22:29:09 +0000 (17:29 -0500)]
freerdp: fix removal of OnParamChange event

10 years agoMerge branch 'audio' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Wed, 11 Dec 2013 22:24:00 +0000 (17:24 -0500)]
Merge branch 'audio' of github.com:FreeRDP/FreeRDP

Conflicts:
libfreerdp/codec/audio.c

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP into audio
Marc-André Moreau [Wed, 11 Dec 2013 22:24:06 +0000 (17:24 -0500)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP into audio

10 years agochannels/rdpsnd: fix audio duration computation for GSM610 format
Marc-André Moreau [Wed, 11 Dec 2013 22:21:29 +0000 (17:21 -0500)]
channels/rdpsnd: fix audio duration computation for GSM610 format

10 years agomfreerdp: code cleanup
Marc-André Moreau [Wed, 11 Dec 2013 19:31:54 +0000 (14:31 -0500)]
mfreerdp: code cleanup

10 years agoMerge branch 'master' of github.com:mrthebunny/FreeRDP
Marc-André Moreau [Wed, 11 Dec 2013 17:22:33 +0000 (12:22 -0500)]
Merge branch 'master' of github.com:mrthebunny/FreeRDP

10 years agoRemove deprecated ParamChanged event
Benoît LeBlanc [Tue, 10 Dec 2013 22:37:08 +0000 (17:37 -0500)]
Remove deprecated ParamChanged event

10 years agolibfreerdp-gdi: port old cunit gdi tests to ctest
Marc-André Moreau [Tue, 10 Dec 2013 21:35:46 +0000 (16:35 -0500)]
libfreerdp-gdi: port old cunit gdi tests to ctest

10 years agofreerdp: fix order of OrderSupport initialization
Marc-André Moreau [Tue, 10 Dec 2013 17:30:25 +0000 (12:30 -0500)]
freerdp: fix order of OrderSupport initialization

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Tue, 10 Dec 2013 16:54:03 +0000 (11:54 -0500)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP

10 years agoMerge pull request #1622 from zhaohb/fix-gdi
Marc-André Moreau [Tue, 10 Dec 2013 16:50:43 +0000 (08:50 -0800)]
Merge pull request #1622 from zhaohb/fix-gdi

Fix some software can not normal work

10 years agochannels/rdpsnd: start using AudioConverter
Marc-André Moreau [Mon, 9 Dec 2013 22:34:23 +0000 (17:34 -0500)]
channels/rdpsnd: start using AudioConverter

10 years agochannels/rdpsnd: start refactoring mac audio code
Marc-André Moreau [Mon, 9 Dec 2013 21:02:42 +0000 (16:02 -0500)]
channels/rdpsnd: start refactoring mac audio code

10 years agoMerge branch 'master' of git://github.com/awakecoding/FreeRDP
Benoît LeBlanc [Mon, 9 Dec 2013 21:00:29 +0000 (16:00 -0500)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

10 years agomissing DEFINE on .h file
Benoît LeBlanc [Mon, 9 Dec 2013 20:30:00 +0000 (15:30 -0500)]
missing DEFINE on .h file

10 years agoPrevent crash in mac CLI application if command-line is not properly parsed (NULL...
Benoît LeBlanc [Mon, 9 Dec 2013 19:28:32 +0000 (14:28 -0500)]
Prevent crash in mac CLI application if command-line is not properly parsed (NULL argv causes segmentation fault when printing usage).

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Mon, 9 Dec 2013 17:06:00 +0000 (12:06 -0500)]
Merge branch 'master' of github.com:awakecoding/FreeRDP

10 years agolibfreerdp-codec: planar cleanup
Marc-André Moreau [Mon, 9 Dec 2013 17:02:05 +0000 (12:02 -0500)]
libfreerdp-codec: planar cleanup

10 years agoMerge pull request #1631 from hardening/version_update2
Marc-André Moreau [Mon, 9 Dec 2013 15:44:20 +0000 (07:44 -0800)]
Merge pull request #1631 from hardening/version_update2

Bumped version number

10 years agoMerge pull request #21 from hardening/version_update
Marc-André Moreau [Mon, 9 Dec 2013 15:09:13 +0000 (07:09 -0800)]
Merge pull request #21 from hardening/version_update

Version update

10 years agoBumped version number
Hardening [Mon, 9 Dec 2013 15:04:01 +0000 (16:04 +0100)]
Bumped version number

10 years agoUpdate version number for master
Hardening [Mon, 9 Dec 2013 14:56:13 +0000 (15:56 +0100)]
Update version number for master

10 years agoMerge branch 'master' of git://github.com/awakecoding/FreeRDP
Benoît LeBlanc [Mon, 9 Dec 2013 14:37:38 +0000 (09:37 -0500)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

10 years agolibfreerdp-codec: avoid pixel overflow with planar codec RLE test cases
Marc-André Moreau [Mon, 9 Dec 2013 04:17:24 +0000 (23:17 -0500)]
libfreerdp-codec: avoid pixel overflow with planar codec RLE test cases

10 years agolibfreerdp-codec: make planar codec encoder context reusable
Marc-André Moreau [Sun, 8 Dec 2013 22:06:59 +0000 (17:06 -0500)]
libfreerdp-codec: make planar codec encoder context reusable

10 years agolibfreerdp-core: disconnect client when accept fails
Marc-André Moreau [Sun, 8 Dec 2013 19:43:11 +0000 (14:43 -0500)]
libfreerdp-core: disconnect client when accept fails

10 years agofreerdp: add missing SurfaceFrameMarkerEnabled setting
Marc-André Moreau [Sun, 8 Dec 2013 16:17:16 +0000 (11:17 -0500)]
freerdp: add missing SurfaceFrameMarkerEnabled setting

10 years agoMerge pull request #20 from hardening/surface_framemarker_support
Marc-André Moreau [Sun, 8 Dec 2013 16:09:01 +0000 (08:09 -0800)]
Merge pull request #20 from hardening/surface_framemarker_support

Fixed typo in the initialization

10 years agoFixed typo in the initialization
Hardening [Sun, 8 Dec 2013 10:22:36 +0000 (11:22 +0100)]
Fixed typo in the initialization

10 years agoMerge pull request #19 from hardening/surface_framemarker_support
Marc-André Moreau [Sat, 7 Dec 2013 18:46:30 +0000 (10:46 -0800)]
Merge pull request #19 from hardening/surface_framemarker_support

Parse the Surface frame marker flag

10 years ago- SSL verification callback: send correct hostname and port
Benoît LeBlanc [Sat, 7 Dec 2013 03:15:45 +0000 (22:15 -0500)]
- SSL verification callback: send correct hostname and port
- Gateway Authentication callback.
- Handling “use same credentials”

10 years agoParse the Surface frame marker flag
Hardening [Fri, 6 Dec 2013 22:25:31 +0000 (23:25 +0100)]
Parse the Surface frame marker flag

This patch adds the parsing for the surface framemarker flag, so that
we can test it later.

10 years agoMerge branch 'master' of git://github.com/awakecoding/FreeRDP
Benoît LeBlanc [Fri, 6 Dec 2013 14:15:02 +0000 (09:15 -0500)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

10 years agoadded const to freerdp_client_get_string_option
Benoît LeBlanc [Fri, 6 Dec 2013 14:14:55 +0000 (09:14 -0500)]
added const to freerdp_client_get_string_option

10 years agolibfreerdp-core: fix possible crash on unauthorized TS Gateway error
Marc-André Moreau [Thu, 5 Dec 2013 22:31:33 +0000 (17:31 -0500)]
libfreerdp-core: fix possible crash on unauthorized TS Gateway error

10 years agolibfreerdp-client: fix bug in pInterface channel registration
Marc-André Moreau [Thu, 5 Dec 2013 21:55:28 +0000 (16:55 -0500)]
libfreerdp-client: fix bug in pInterface channel registration

10 years agolibfreerdp-client: cleanup .rdp file parsing
Marc-André Moreau [Thu, 5 Dec 2013 17:35:31 +0000 (12:35 -0500)]
libfreerdp-client: cleanup .rdp file parsing

10 years agoFix warnings
Benoît LeBlanc [Thu, 5 Dec 2013 17:12:55 +0000 (12:12 -0500)]
Fix warnings

10 years agoMerge pull request #1624 from bmiklautz/ios
Martin Fleisz [Thu, 5 Dec 2013 13:35:34 +0000 (05:35 -0800)]
Merge pull request #1624 from bmiklautz/ios

iOS: Removed unused code

10 years agolibwinpr-utils: create wlog output directory
Marc-André Moreau [Thu, 5 Dec 2013 04:46:58 +0000 (23:46 -0500)]
libwinpr-utils: create wlog output directory

10 years agolibfreerdp-common: add fine grained control over .rdp file writing functions
Marc-André Moreau [Wed, 4 Dec 2013 23:25:55 +0000 (18:25 -0500)]
libfreerdp-common: add fine grained control over .rdp file writing functions

10 years agolibfreerdp-client: add functions for getting/setting rdp file options
Marc-André Moreau [Wed, 4 Dec 2013 21:29:45 +0000 (16:29 -0500)]
libfreerdp-client: add functions for getting/setting rdp file options

10 years agolibfreerdp-client: start extending .rdp file parsing capabilities
Marc-André Moreau [Wed, 4 Dec 2013 20:37:42 +0000 (15:37 -0500)]
libfreerdp-client: start extending .rdp file parsing capabilities

10 years agoMerge pull request #1620 from bmiklautz/platform_builds
Marc-André Moreau [Wed, 4 Dec 2013 16:14:41 +0000 (08:14 -0800)]
Merge pull request #1620 from bmiklautz/platform_builds

Cmake preload scripts for CI added

10 years agoMerge pull request #1625 from bmiklautz/disconnect
Marc-André Moreau [Wed, 4 Dec 2013 16:07:23 +0000 (08:07 -0800)]
Merge pull request #1625 from bmiklautz/disconnect

tls: handle the case if endpoint has disconnected

10 years agotls: handle the case if endpoint has disconnected
Bernhard Miklautz [Wed, 4 Dec 2013 14:36:25 +0000 (15:36 +0100)]
tls: handle the case if endpoint has disconnected

10 years agoiOS: Removed unused code
Martin Fleisz [Wed, 4 Dec 2013 11:25:14 +0000 (12:25 +0100)]
iOS: Removed unused code

10 years agoupdated file headers
Bernhard Miklautz [Wed, 4 Dec 2013 10:37:57 +0000 (11:37 +0100)]
updated file headers

10 years agolibfreerdp-codec: add new planar codec test case
Marc-André Moreau [Wed, 4 Dec 2013 01:14:07 +0000 (20:14 -0500)]
libfreerdp-codec: add new planar codec test case

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Tue, 3 Dec 2013 23:50:40 +0000 (18:50 -0500)]
Merge branch 'master' of github.com:awakecoding/FreeRDP

10 years agolibfreerdp-codec: make planar codec bitmap 01 pass the test
Marc-André Moreau [Tue, 3 Dec 2013 23:50:22 +0000 (18:50 -0500)]
libfreerdp-codec: make planar codec bitmap 01 pass the test

10 years agoifreerdp: fix iOS/OSX platform detection
Marc-André Moreau [Tue, 3 Dec 2013 20:19:58 +0000 (15:19 -0500)]
ifreerdp: fix iOS/OSX platform detection

10 years agocmake: fix Android toolchain on 64-bit hosts
Marc-André Moreau [Tue, 3 Dec 2013 17:10:12 +0000 (12:10 -0500)]
cmake: fix Android toolchain on 64-bit hosts

10 years agoMerge branch 'master' of github.com:awakecoding/FreeRDP
Marc-André Moreau [Tue, 3 Dec 2013 05:52:36 +0000 (00:52 -0500)]
Merge branch 'master' of github.com:awakecoding/FreeRDP

10 years agolibwinpr-environment: fix usage of environ on OS X
Marc-André Moreau [Tue, 3 Dec 2013 05:52:02 +0000 (00:52 -0500)]
libwinpr-environment: fix usage of environ on OS X

10 years agoFix some software can not normal work
ZhaoHongbo [Mon, 2 Dec 2013 02:41:58 +0000 (10:41 +0800)]
Fix some software can not normal work

10 years agoCmake preload scripts for CI added
Bernhard Miklautz [Sat, 30 Nov 2013 15:43:37 +0000 (16:43 +0100)]
Cmake preload scripts for CI added

10 years agoMerge pull request #18 from hardening/gcc_fixes
Marc-André Moreau [Fri, 29 Nov 2013 17:59:55 +0000 (09:59 -0800)]
Merge pull request #18 from hardening/gcc_fixes

More security in gcc.c

10 years agolibfreerdp-codec: make planar decoder more robust
Marc-André Moreau [Fri, 29 Nov 2013 09:12:59 +0000 (04:12 -0500)]
libfreerdp-codec: make planar decoder more robust

10 years agolibfreerdp-codec: refactor planar decompression
Marc-André Moreau [Fri, 29 Nov 2013 08:06:39 +0000 (03:06 -0500)]
libfreerdp-codec: refactor planar decompression

10 years agolibfreerdp-codec: add more planar unit tests
Marc-André Moreau [Fri, 29 Nov 2013 07:16:16 +0000 (02:16 -0500)]
libfreerdp-codec: add more planar unit tests

10 years agolibfreerdp-codec: extend planar codec unit tests
Marc-André Moreau [Fri, 29 Nov 2013 00:51:29 +0000 (19:51 -0500)]
libfreerdp-codec: extend planar codec unit tests

10 years agoMore security in gcc.c
Hardening [Thu, 28 Nov 2013 22:17:21 +0000 (23:17 +0100)]
More security in gcc.c

As strange as it looks, i have found more errors that could lead to
security issues in gcc.c.

10 years agolibfreerdp-codec: reorganize planar RLE encoding logic
Marc-André Moreau [Thu, 28 Nov 2013 20:49:22 +0000 (15:49 -0500)]
libfreerdp-codec: reorganize planar RLE encoding logic

10 years agolibfreerdp-codec: improve planar RLE compression
Marc-André Moreau [Wed, 27 Nov 2013 23:21:05 +0000 (18:21 -0500)]
libfreerdp-codec: improve planar RLE compression

10 years agolibfreerdp-codec: detect planar overflow per set of planes, not individual planes
Marc-André Moreau [Wed, 27 Nov 2013 21:23:20 +0000 (16:23 -0500)]
libfreerdp-codec: detect planar overflow per set of planes, not individual planes

10 years agolibfreerdp-codec: simply planar RLE code
Marc-André Moreau [Wed, 27 Nov 2013 19:46:38 +0000 (14:46 -0500)]
libfreerdp-codec: simply planar RLE code

10 years agolibfreerdp-codec: partial planar RLE compression support
Marc-André Moreau [Wed, 27 Nov 2013 03:16:31 +0000 (22:16 -0500)]
libfreerdp-codec: partial planar RLE compression support

10 years agolibfreerdp-codec: compress and output RDP6 RLE planes
Marc-André Moreau [Tue, 26 Nov 2013 23:04:29 +0000 (18:04 -0500)]
libfreerdp-codec: compress and output RDP6 RLE planes

10 years agolibfreerdp-codec: get all steps of planar scanline delta encoding tested
Marc-André Moreau [Tue, 26 Nov 2013 21:30:43 +0000 (16:30 -0500)]
libfreerdp-codec: get all steps of planar scanline delta encoding tested

10 years agolibfreerdp-codec: start implementing delta-encoding of planar scanlines
Marc-André Moreau [Tue, 26 Nov 2013 21:07:55 +0000 (16:07 -0500)]
libfreerdp-codec: start implementing delta-encoding of planar scanlines

10 years agolibfreerdp-codec: implement planar codec RLE scanline encoding
Marc-André Moreau [Tue, 26 Nov 2013 20:16:40 +0000 (15:16 -0500)]
libfreerdp-codec: implement planar codec RLE scanline encoding

10 years agolibfreerdp-core: fix transport_free in cases where transport thread was not started
Marc-André Moreau [Tue, 26 Nov 2013 16:30:44 +0000 (11:30 -0500)]
libfreerdp-core: fix transport_free in cases where transport thread was not started

10 years agoMerge branch 'master' of github.com:mrthebunny/FreeRDP
Marc-André Moreau [Tue, 26 Nov 2013 16:10:44 +0000 (11:10 -0500)]
Merge branch 'master' of github.com:mrthebunny/FreeRDP

10 years agolibfreerdp-codec: implement working uncompressed RDP6 bitmap planar codec
Marc-André Moreau [Tue, 26 Nov 2013 04:29:20 +0000 (23:29 -0500)]
libfreerdp-codec: implement working uncompressed RDP6 bitmap planar codec

10 years agolibfreerdp-codec: start implementing uncompressed RDP6 planar codec
Marc-André Moreau [Tue, 26 Nov 2013 03:26:08 +0000 (22:26 -0500)]
libfreerdp-codec: start implementing uncompressed RDP6 planar codec

10 years agolibfreerdp-codec: start unit tests for RDP6 planar compressor
Marc-André Moreau [Mon, 25 Nov 2013 23:58:01 +0000 (18:58 -0500)]
libfreerdp-codec: start unit tests for RDP6 planar compressor

10 years agoMerge branch 'master' of git://github.com/awakecoding/FreeRDP
Benoît LeBlanc [Mon, 25 Nov 2013 19:40:01 +0000 (14:40 -0500)]
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Bernhard Miklautz (10) and others
# Via Marc-André Moreau (10) and Martin Fleisz (1)
* 'master' of git://github.com/awakecoding/FreeRDP: (32 commits)
  libfreerdp-crypto: add robustness checks for VerifyX509Certificate
  mfreerdp: fix possible crash on gdi termination
  channels/cliprdr: add callback for data request response
  channels/cliprdr: fix conflict with CLIPRDR_HEADER
  fix a gdi leak bug.
  channels/cliprdr: implement more of the callback interface
  channels/cliprdr: start implementing clean callback interface
  channels/rdpsnd: initial attempt at adding GSM610 support
  winpr-thread: fixed bugs in _CreateProcessExA
  ffmpeg-2 -- CodecID
  ffmpeg-2 -- dsp_mask
  ffmpeg-2 -- AVCODEC_MAX_AUDIO_FRAME_SIZE
  check return value.
  reformat coding styles.
  fix name length to copy.
  fix memory realloc size error.
  libfreerdp-crypto: don't report SSL_ERROR_SYSCALL with errno value 0 as error
  channels/rdpsnd: add wlog debug output
  android toolchain: support for ndk r9b
  android toolchain: fixed cmake syntax warning
  ...

10 years agoAdded hostname and port to callback function for SSL certification verification.
Benoît LeBlanc [Mon, 25 Nov 2013 19:30:43 +0000 (14:30 -0500)]
Added hostname and port to callback function for SSL certification verification.

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Mon, 25 Nov 2013 17:31:43 +0000 (12:31 -0500)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP

10 years agolibfreerdp-crypto: add robustness checks for VerifyX509Certificate
Marc-André Moreau [Mon, 25 Nov 2013 17:08:58 +0000 (12:08 -0500)]
libfreerdp-crypto: add robustness checks for VerifyX509Certificate

10 years agoMerge pull request #1615 from zhangzl2013/bug-gdi-leak
Martin Fleisz [Mon, 25 Nov 2013 08:30:50 +0000 (00:30 -0800)]
Merge pull request #1615 from zhangzl2013/bug-gdi-leak

fix a gdi leak bug.

10 years agomfreerdp: fix possible crash on gdi termination
Marc-André Moreau [Mon, 25 Nov 2013 05:25:16 +0000 (00:25 -0500)]
mfreerdp: fix possible crash on gdi termination

10 years agochannels/cliprdr: add callback for data request response
Marc-André Moreau [Mon, 25 Nov 2013 01:46:56 +0000 (20:46 -0500)]
channels/cliprdr: add callback for data request response

10 years agochannels/cliprdr: fix conflict with CLIPRDR_HEADER
Marc-André Moreau [Sun, 24 Nov 2013 20:35:26 +0000 (15:35 -0500)]
channels/cliprdr: fix conflict with CLIPRDR_HEADER

10 years agofix a gdi leak bug.
Zhang Zhaolong [Sun, 24 Nov 2013 08:01:11 +0000 (16:01 +0800)]
fix a gdi leak bug.

10 years agochannels/cliprdr: implement more of the callback interface
Marc-André Moreau [Sun, 24 Nov 2013 04:45:31 +0000 (23:45 -0500)]
channels/cliprdr: implement more of the callback interface

10 years agochannels/cliprdr: start implementing clean callback interface
Marc-André Moreau [Sun, 24 Nov 2013 02:35:44 +0000 (21:35 -0500)]
channels/cliprdr: start implementing clean callback interface

10 years agoMerge branch 'master' of github.com:FreeRDP/FreeRDP
Marc-André Moreau [Sat, 23 Nov 2013 21:39:29 +0000 (16:39 -0500)]
Merge branch 'master' of github.com:FreeRDP/FreeRDP

Conflicts:
libfreerdp/core/input.c
libfreerdp/core/update.c

10 years agoMerge pull request #1599 from akallabeth/helper_script
Marc-André Moreau [Sat, 23 Nov 2013 21:36:15 +0000 (13:36 -0800)]
Merge pull request #1599 from akallabeth/helper_script

[ANDROID] Added script to automate gprof reporting.