projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5aa5dd4 700060d)
Merge pull request #1629 from bmiklautz/update_pull_1609
authorHardening <rdp.effort@gmail.com>
Tue, 20 May 2014 20:10:17 +0000 (22:10 +0200)
committerHardening <rdp.effort@gmail.com>
Tue, 20 May 2014 20:10:17 +0000 (22:10 +0200)
Android jpeg build enhancement

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
libfreerdp/codec/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc libfreerdp/codec/CMakeLists.txt
Simple merge
Domain: Graphics System / Display Server;