← Back to branch summary

~jordens/darktable/debian-packaging

~jordens/darktable/debian-packaging

Viewing all changes in revision 901.

Committer: David Bremner
Date: 2013-02-09 15:34:02 UTC
mfrom: (744.77.660)
Revision ID: git-v1:1183fbdf83ecee48db9b1ea38cce74eec49a2a6d

Merge tag 'upstream/1.1.3'

files modified:
cmake/version.cmake

packaging/macosx/BUILD.txt

packaging/macosx/make-app-bundle

packaging/macosx/start

src/CMakeLists.txt

src/cli/CMakeLists.txt

src/cli/main.c

src/common/colormatrices.c

src/common/darktable.c

src/common/exif.cc

src/common/exif.h

src/common/file_location.c

src/common/image.c

src/common/imageio.c

src/common/nvidia_gpus.h

src/common/selection.c

src/control/jobs/control_jobs.c

src/develop/blend.c

src/develop/blend_gui.c

src/develop/pixelpipe_hb.c

src/external/adobe_coeff.c

src/external/osm-gps-map/src/osm-gps-map-image.c

src/external/osm-gps-map/src/osm-gps-map-image.h

src/external/rawspeed/RawSpeed/ArwDecoder.cpp

src/external/rawspeed/RawSpeed/BitPumpJPEG.cpp

src/external/rawspeed/RawSpeed/BitPumpJPEG.h

src/external/rawspeed/RawSpeed/BitPumpMSB.cpp

src/external/rawspeed/RawSpeed/BitPumpMSB.h

src/external/rawspeed/RawSpeed/ByteStream.h

src/external/rawspeed/RawSpeed/CameraMetaData.cpp

src/external/rawspeed/RawSpeed/CameraMetaData.h

src/external/rawspeed/RawSpeed/DngDecoder.cpp

src/external/rawspeed/RawSpeed/DngDecoderSlices.cpp

src/external/rawspeed/RawSpeed/LJpegPlain.cpp

src/external/rawspeed/RawSpeed/NikonDecompressor.cpp

src/external/rawspeed/RawSpeed/RawImageDataU16.cpp

src/external/rawspeed/data/cameras.xml

src/gui/gtk.c

src/iop/bilat.c

src/iop/borders.c

src/iop/channelmixer.c

src/iop/colorzones.c

src/iop/exposure.c

src/iop/globaltonemap.c

src/iop/invert.c

src/iop/lens.c

src/iop/relight.c

src/iop/tonecurve.c

src/iop/wb_presets.c

src/libs/backgroundjobs.c

src/views/lighttable.c

Show diffs side-by-side

added added

removed removed

cmake/version.cmake

packaging/macosx/BUILD.txt

packaging/macosx/make-app-bundle

packaging/macosx/start

src/CMakeLists.txt

src/cli/CMakeLists.txt

src/common/colormatrices.c

src/common/darktable.c

src/common/exif.cc

src/common/exif.h

src/common/file_location.c

src/common/image.c

src/common/imageio.c

src/common/nvidia_gpus.h

src/common/selection.c

src/control/jobs/control_jobs.c

src/develop/blend.c

src/develop/blend_gui.c

src/develop/pixelpipe_hb.c

src/external/adobe_coeff.c

src/external/osm-gps-map/src/osm-gps-map-image.c

src/external/osm-gps-map/src/osm-gps-map-image.h

src/external/rawspeed/RawSpeed/ArwDecoder.cpp

src/external/rawspeed/RawSpeed/BitPumpJPEG.cpp

src/external/rawspeed/RawSpeed/BitPumpJPEG.h

src/external/rawspeed/RawSpeed/BitPumpMSB.cpp

src/external/rawspeed/RawSpeed/BitPumpMSB.h

src/external/rawspeed/RawSpeed/ByteStream.h

src/external/rawspeed/RawSpeed/CameraMetaData.cpp

src/external/rawspeed/RawSpeed/CameraMetaData.h

src/external/rawspeed/RawSpeed/DngDecoder.cpp

src/external/rawspeed/RawSpeed/DngDecoderSlices.cpp

src/external/rawspeed/RawSpeed/LJpegPlain.cpp

src/external/rawspeed/RawSpeed/NikonDecompressor.cpp

src/external/rawspeed/RawSpeed/RawImageDataU16.cpp

src/external/rawspeed/data/cameras.xml

src/iop/bilat.c

src/iop/borders.c

src/iop/channelmixer.c

src/iop/colorzones.c

src/iop/exposure.c

src/iop/globaltonemap.c

src/iop/invert.c

src/iop/relight.c

src/iop/tonecurve.c

src/iop/wb_presets.c

src/libs/backgroundjobs.c

src/views/lighttable.c

Older »