Luminance HDR

Commit [a4bc9a] Array2DTemplate ImproveFusionAlgos anti-ghosting auto-anti-ghosting auto-deghosting cms cmyk editing-panel floating-previews master new-wizard png qt5 realtime-previews update-checker History

Merge branch 'master' into os-progressbar

Conflicts:
src/BatchHDR/BatchHDRDialog.cpp

Authored by: Daniel Kaneider 2012-03-20

Browse code at this revision

Parent(s): [06fc6f][9222f0]

Child(ren): [712447]

changed	i18n/lang_cs.ts
changed	i18n/lang_de.ts
changed	i18n/lang_es.ts
changed	i18n/lang_fi.ts
changed	i18n/lang_fr.ts
changed	i18n/lang_hu.ts
changed	i18n/lang_id.ts
changed	i18n/lang_it.ts
changed	i18n/lang_pl.ts
changed	i18n/lang_ro.ts
changed	i18n/lang_ru.ts
changed	i18n/lang_tr.ts
changed	src/BatchHDR/BatchHDRDialog.cpp
changed	src/BatchHDR/BatchHDRDialog.h
changed	src/HdrCreation/HdrCreationManager.cpp
changed	src/HdrCreation/HdrCreationManager.h
changed	src/MainCli/commandline.cpp
changed	src/MainCli/commandline.h
changed	luminance-hdr.desktop

i18n/lang_cs.ts Diff Switch to side-by-side view

i18n/lang_de.ts Diff Switch to side-by-side view

i18n/lang_es.ts Diff Switch to side-by-side view

i18n/lang_fi.ts Diff Switch to side-by-side view

i18n/lang_fr.ts Diff Switch to side-by-side view

i18n/lang_hu.ts Diff Switch to side-by-side view

i18n/lang_id.ts Diff Switch to side-by-side view

i18n/lang_it.ts Diff Switch to side-by-side view

i18n/lang_pl.ts Diff Switch to side-by-side view

i18n/lang_ro.ts Diff Switch to side-by-side view

i18n/lang_ru.ts Diff Switch to side-by-side view

i18n/lang_tr.ts Diff Switch to side-by-side view

src/BatchHDR/BatchHDRDialog.cpp Diff Switch to side-by-side view

src/BatchHDR/BatchHDRDialog.h Diff Switch to side-by-side view

src/HdrCreation/HdrCreationManager.cpp Diff Switch to side-by-side view

src/HdrCreation/HdrCreationManager.h Diff Switch to side-by-side view

src/MainCli/commandline.cpp Diff Switch to side-by-side view

src/MainCli/commandline.h Diff Switch to side-by-side view

luminance-hdr.desktop Diff Switch to side-by-side view