summaryrefslogtreecommitdiffstats
path: root/image.c
diff options
context:
space:
mode:
authorBert <ber.t@gmx.com>2011-02-14 17:56:29 +0100
committerBert <ber.t@gmx.com>2011-02-14 17:56:29 +0100
commite1cc8058fff4e0d64b840ac6da2eda3f6c2ed5fc (patch)
treeb29e79c7468502db1f88eeb0ce01cc3b211f28b9 /image.c
parentf71ea095bc11dbc00eb1a27a67eb07d36324213f (diff)
parentc9a887d0fd5ad28fa8c51259fc47b4498ab9c525 (diff)
downloadnsxiv-e1cc8058fff4e0d64b840ac6da2eda3f6c2ed5fc.tar.zst
Merge remote-tracking branch 'origin/master'
Conflicts: Makefile
Diffstat (limited to 'image.c')
0 files changed, 0 insertions, 0 deletions