Backported #6865: Disable websockets command line option
[platform/upstream/freerdp.git] / cmake / FindImageMagick.cmake
2013-08-27 Mike McDonaldMerge remote-tracking branch 'upstream/master'
2013-08-06 Armin NovakMerge remote-tracking branch 'upstream/master'
2013-08-03 Marc-André MoreauMerge pull request #1386 from akallabeth/master
2013-08-03 Marc-André MoreauMerge pull request #1389 from akallabeth/urbdrc_cmake_fixes
2013-07-25 Benoît LeBlancMerge branch 'master' of https://github.com/awakecoding...
2013-07-23 Marc-André MoreauMerge branch 'master' of github.com:FreeRDP/FreeRDP
2013-07-23 Marc-André MoreauMerge pull request #1356 from nfedera/fix-2013-07-17-01
2013-07-23 Marc-André MoreauMerge pull request #1367 from C-o-r-E/master
2013-07-17 C-o-r-Emerged from upstream
2013-06-26 C-o-r-Emerged completely (painful) from awakecoding's tree
2013-06-05 C-o-r-Emerged upstream
2013-05-27 C-o-r-EMerge remote-tracking branch 'upstream/master'
2013-05-13 C-o-r-Eattempt fixing big merge
2013-05-05 C-o-r-Emerged
2013-05-01 C-o-r-Exfreerdp-client: hack cmake for ubuntu imagemagick