Backported #6865: Disable websockets command line option
[platform/upstream/freerdp.git] / cmake / ConfigOptionsAndroid.cmake
2017-01-17 Armin NovakMerge branch 'patch-2' of https://github.com/AMV007...
2016-12-09 Christian PlattnerMerge branch 'gateway-http-bugfix'
2016-03-04 Bernhard MiklautzMerge pull request #1726 from grpomega/patch-3
2016-02-23 akallabethMerge pull request #2851 from ilammy/x11-cliprdr/improv...
2016-02-11 HardeningMerge pull request #3110 from akallabeth/mac_os_ssl_war...
2016-02-05 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2016-02-04 Martin FleiszMerge pull request #3097 from akallabeth/android_api_up...
2016-02-01 Armin NovakFixed android build issues.
2015-07-15 Martin HaimbergerMerge remote-tracking branch 'upstream/master' into...
2015-06-26 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2015-06-26 Marc-André MoreauMerge pull request #2719 from bmiklautz/pull/2481
2015-06-24 Martin FleiszMerge pull request #2717 from realjiangms/shadow_encode...
2015-06-23 Norbert FederaMerge pull request #2708 from bmiklautz/dupdup
2015-06-22 Bernhard Miklautzclient/android: misc updates and fixes
2015-01-22 Christian PlattnerMerge remote-tracking branch 'upstream/master' into...
2014-12-05 Norbert FederaMerge pull request #2256 from llyzs/llyzs
2014-12-04 Martin FleiszMerge pull request #2110 from akallabeth/winpr_backtrac...
2014-11-25 Marc-André MoreauMerge branch 'awakecoding' of github.com:vworkspace...
2014-11-15 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2014-11-15 Marc-André MoreauMerge pull request #2211 from bmiklautz/feat/ndk10
2014-11-15 Bernhard Miklautzandroid: update target sdk to 21
2014-08-18 Marc-André MoreauMerge pull request #2045 from zhangzl2013/fix-cut-fold
2014-08-01 Mike McDonaldMerge branch 'awakecoding' of https://github.com/vworks...
2014-07-11 Marc-André MoreauMerge pull request #1917 from SBoyNumber1/BitmapCacheV3...
2014-07-02 Marc-André MoreauMerge pull request #1901 from erbth/master_new
2014-06-30 Mike McDonaldMerge branch 'master' of https://github.com/awakecoding...
2014-06-30 Emmanuel LedouxMerge branch 'ports'
2014-06-24 Mike McDonaldMerge branch 'master' of https://github.com/awakecoding...
2014-06-23 Marc-André MoreauMerge branch 'master' of github.com:awakecoding/FreeRDP...
2014-06-23 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2014-06-23 Martin FleiszMerge pull request #1922 from akallabeth/android-ui...
2014-06-23 Armin NovakNow requiring target android SDK 14 by default.
2014-05-20 HardeningMerge pull request #1430 from sukhodolin/Fixes
2014-04-02 Marc-André MoreauMerge branch 'master' of github.com:awakecoding/FreeRDP...
2013-12-11 Marc-André MoreauMerge branch 'master' of github.com:mrthebunny/FreeRDP
2013-12-10 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-12-10 Marc-André MoreauMerge pull request #1622 from zhaohb/fix-gdi
2013-12-04 Marc-André MoreauMerge pull request #1620 from bmiklautz/platform_builds
2013-12-04 Bernhard Miklautzupdated file headers
2013-11-14 Benoît LeBlancMerge branch 'master' of git://github.com/awakecoding...
2013-11-13 Martin FleiszMerge pull request #1585 from dbungert/hostname
2013-11-12 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-11-12 Marc-André MoreauMerge pull request #1588 from akallabeth/message_queue_...
2013-11-12 Marc-André MoreauMerge pull request #1580 from akallabeth/android_cleanu...
2013-11-08 Armin NovakFixed invaid setting of android app default version.
2013-11-08 Armin NovakAndroid App version now configurable from cmake.
2013-10-24 Marc-André MoreauMerge branch 'smartcard_context_fix' of https://github...
2013-10-19 Marc-André MoreauMerge branch 'master' of github.com:mrthebunny/FreeRDP
2013-10-17 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-10-04 Bernhard MiklautzMerge pull request #1523 from akallabeth/cmdline_parser_fix
2013-10-04 Armin NovakMerge branch 'master' of https://github.com/FreeRDP...
2013-10-04 Armin NovakMerge remote-tracking branch 'upstream/master' into...
2013-10-03 Bernhard MiklautzMerge pull request #1524 from akallabeth/android_debug_...
2013-10-02 Benoît LeBlancMerge branch 'master' of https://github.com/awakecoding...
2013-10-02 Armin NovakMerge branch 'master' of https://github.com/FreeRDP...
2013-10-02 Armin NovakImplemented debug menu hidden in relase builds.
2013-10-02 Martin FleiszMerge pull request #1521 from bmiklautz/issue/1519
2013-10-02 Bernhard Miklautzandriod: removed unecessary config option
2013-10-01 Bernhard Miklautzandroid build: don't set WITH_OPENSLES in options
2013-10-01 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-10-01 Armin NovakMerge branch 'android_async' of github.com:akallabeth...
2013-10-01 Bernhard MiklautzMerge pull request #1514 from akallabeth/android_sound
2013-10-01 Bernhard MiklautzMerge pull request #1491 from akallabeth/android_profiler
2013-09-30 Benoît LeBlancMerged changes from FreeRDP branch, notably support...
2013-09-27 Armin NovakMerge branch 'master' of https://github.com/FreeRDP...
2013-09-27 Armin NovakIncreased mimimum android version to API level 9. Requi...
2013-09-25 Marc-André MoreauMerge pull request #1509 from akallabeth/smartcard_fixes
2013-09-23 Armin NovakAdded CMake configuration options.
2013-09-19 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-09-19 Marc-André MoreauMerge pull request #1492 from elupus/passwd
2013-09-19 Marc-André MoreauMerge pull request #1496 from akallabeth/alsa_fix
2013-09-19 Armin NovakMerge branch 'android_build_enhanced' into android_sound
2013-09-19 Bernhard MiklautzMerge pull request #1486 from akallabeth/android_build_...
2013-09-17 Armin NovakFixed typo in config options for android.
2013-09-17 Armin NovakAdded configuration options for android SDK
2013-02-02 Marc-André MoreauMerge pull request #932 from hardening/remoteFxChecks
2013-02-02 Marc-André MoreauMerge pull request #949 from hardening/eventfd
2013-01-31 C-o-r-EMerge branch 'master' of https://github.com/C-o-r-E...
2013-01-31 C-o-r-EMerge remote-tracking branch 'upstream/master'
2013-01-29 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-01-29 David LesaffreMerge remote-tracking branch 'upstream/master'
2013-01-29 Marc-André MoreauMerge pull request #933 from thinstuff/android
2013-01-29 Bernhard MiklautzaFreeRDP: initial release