diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-29 11:21:09 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-29 11:21:09 +0200 |
commit | 3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1 (patch) | |
tree | d0b4c045bf363ac03054b2c5fe7288fa0cece50b /nxcomp/PutImage.cpp | |
parent | b9fb7a05ae01329ef6579b8a1d83926fe5374a76 (diff) | |
parent | c355dc91d35c74234c24dfbf013dfac98110d352 (diff) | |
download | nx-libs-3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1.tar.gz nx-libs-3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1.tar.bz2 nx-libs-3314c24a786e8e8bfad3c9ebfdf272839cb4e7e1.zip |
Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.x
Attributes GH PR #145: https://github.com/ArcticaProject/nx-libs/pull/145
Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Wed, 29 Jun 2016 11:22:30 +0200
Diffstat (limited to 'nxcomp/PutImage.cpp')
0 files changed, 0 insertions, 0 deletions