diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:24:18 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:24:18 +0100 |
commit | 9d41e84ea9baf215c6de11224dc2597cd37359dc (patch) | |
tree | 0b1ace237a54d171c83cb79750af11a050a99fdd /nxcomp/Bitmap.cpp | |
parent | 554a6fa760de47c497abcc91bb5f1f9b2756a407 (diff) | |
parent | ce037f4e3c15c7cbc50adb02f6027a4d37c0ab90 (diff) | |
download | nx-libs-9d41e84ea9baf215c6de11224dc2597cd37359dc.tar.gz nx-libs-9d41e84ea9baf215c6de11224dc2597cd37359dc.tar.bz2 nx-libs-9d41e84ea9baf215c6de11224dc2597cd37359dc.zip |
Merge branch 'sunweaver-pr/allow-empty-nx-options-string' into 3.6.x
Attributes GH PR #314: https://github.com/ArcticaProject/nx-libs/pull/314
Fixes: ArcticaProject/nx-libs#51.
Diffstat (limited to 'nxcomp/Bitmap.cpp')
0 files changed, 0 insertions, 0 deletions