aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Jpeg.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-28 12:14:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-28 12:14:22 +0200
commit443b52723e9d790e3a619406bcd8b0dd32390dc3 (patch)
tree3dc9faf4fe851d1d9a1c5062638cbd3874857163 /nxcomp/Jpeg.cpp
parente1c85caacca67ea3d25319f2fe0a2985845bf1e9 (diff)
parent64a83d1e08fd8224a065d6e3548be6323127d4df (diff)
downloadnx-libs-443b52723e9d790e3a619406bcd8b0dd32390dc3.tar.gz
nx-libs-443b52723e9d790e3a619406bcd8b0dd32390dc3.tar.bz2
nx-libs-443b52723e9d790e3a619406bcd8b0dd32390dc3.zip
Merge branch 'Ionic-feature/reconnect-checks' into 3.6.x
Attributes GH PR #183: https://github.com/ArcticaProject/nx-libs/pull/183 Together with PR #143 this fixes ArcticaProject/nx-libs#132. t merges an updated upstream into a topic branch.
Diffstat (limited to 'nxcomp/Jpeg.cpp')
0 files changed, 0 insertions, 0 deletions