Backported #6865: Disable websockets command line option
[platform/upstream/freerdp.git] / cmake / ComplexLibrary.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-05 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2016-01-19 Martin FleiszMerge pull request #3014 from bmiklautz/winpr_nt_file
2016-01-12 HardeningMerge pull request #3046 from bmiklautz/tls12
2016-01-12 Martin FleiszMerge pull request #3043 from bmiklautz/prep2.0
2016-01-12 Bernhard Miklautzbuild: remove FREERDP_MONOLITHIC_BUILD
2015-01-20 Christian PlattnerMerge commit '709df9^' into httpproxy
2015-01-19 Christian PlattnerMerge commit 'dd6d82955087e1b53c8d9f1a7a5b252c8a545210...
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-06-30 Emmanuel LedouxMerge branch 'ports'
2014-06-11 Armin NovakMerge remote-tracking branch 'origin/master' into tsmf...
2014-06-04 Marc-André MoreauMerge pull request #1875 from jbd1986/fix-rdp-file...
2014-06-04 Marc-André MoreauMerge pull request #1872 from nfedera/fix-2014-05-28-01
2014-06-04 Marc-André MoreauMerge pull request #1868 from akallabeth/x11_shutdown_fix
2014-06-03 Martin FleiszMerge pull request #1873 from hardening/WTSVirtualChann...
2014-05-30 Marc-André MoreauMerge pull request #1877 from awakecoding/master
2014-05-30 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2014-05-29 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2014-05-26 Marc-André Moreaucmake: add option to override default library type...
2014-05-21 Bernhard MiklautzMerge pull request #1762 from zhangzl2013/wfreerdp
2014-05-20 HardeningMerge pull request #1629 from bmiklautz/update_pull_1609
2014-05-20 HardeningMerge pull request #1430 from sukhodolin/Fixes
2014-05-08 Marc-André MoreauMerge branch 'awakecoding' of github.com:vworkspace...
2014-04-28 Benoit LeBlancMerge branch 'master' of git://github.com/awakecoding...
2014-04-27 Marc-André MoreauMerge branch 'master' of github.com:awakecoding/FreeRDP...
2014-04-26 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2014-04-23 Marc-André MoreauMerge pull request #1806 from bmiklautz/feat/export_modules
2014-04-23 Bernhard Miklautzexport_complex_library add support for long names
2014-04-22 Bernhard Miklautzcmake: remove debug message
2014-04-22 Bernhard Miklautzcmake: add_complex_library add EXPORT parameter
2014-04-22 Bernhard Miklautzcmake: add export_complex_library function
2013-09-25 Marc-André MoreauMerge pull request #1509 from akallabeth/smartcard_fixes
2013-09-19 Marc-André MoreauMerge pull request #1492 from elupus/passwd
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-16 Marc-André MoreauMerge pull request #1483 from awakecoding/master
2013-09-16 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-09-16 Marc-André Moreaufreerdp: merge with master
2013-09-05 Marc-André MoreauMerge branch 'master' of github.com:awakecoding/FreeRDP...
2013-09-05 Marc-André Moreaucmake: add target helper functions
2012-10-18 Corey Cwfreerdp-server: merged upstream
2012-10-17 Marc-André MoreauMerge pull request #774 from FreeRDP/channels
2012-10-16 Marc-André Moreauwfreerdp-server: merging Corey's sound support with...
2012-10-16 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP...
2012-10-13 Marc-André Moreaucmake: started simplifying monolithic build option