Merge lp://qastaging/~noskcaj/ubuntu/trusty/entangle/merge into lp://qastaging/ubuntu/trusty/entangle

AUTHORS (+1/-0)
ChangeLog (+153/-0)
NEWS (+19/-0)
README (+2/-1)
cfg.mk (+8/-0)
configure (+19/-13)
configure.ac (+1/-1)
debian/changelog (+14/-0)
debian/control (+1/-1)
docs/man/en/entangle.1 (+1/-1)
docs/reference/Entangle-sections.txt (+78/-85)
docs/reference/Entangle.types (+4/-0)
docs/reference/html/Entangle-entangle-debug.html (+4/-4)
docs/reference/html/Entangle-entangle-dpms.html (+4/-4)
docs/reference/html/Entangle-entangle-pixbuf.html (+2/-2)
docs/reference/html/Entangle.devhelp2 (+1/-27)
docs/reference/html/EntangleApplication.html (+3/-3)
docs/reference/html/EntangleCamera.html (+275/-275)
docs/reference/html/EntangleCameraFile.html (+25/-25)
docs/reference/html/EntangleCameraInfo.html (+19/-43)
docs/reference/html/EntangleCameraList.html (+13/-13)
docs/reference/html/EntangleCameraManager.html (+13/-47)
docs/reference/html/EntangleCameraPicker.html (+34/-42)
docs/reference/html/EntangleCameraSupport.html (+19/-41)
docs/reference/html/EntangleColourProfile.html (+8/-8)
docs/reference/html/EntangleControl.html (+39/-39)
docs/reference/html/EntangleControlButton.html (+3/-3)
docs/reference/html/EntangleControlChoice.html (+5/-5)
docs/reference/html/EntangleControlDate.html (+5/-5)
docs/reference/html/EntangleControlGroup.html (+15/-15)
docs/reference/html/EntangleControlPanel.html (+6/-6)
docs/reference/html/EntangleControlRange.html (+11/-11)
docs/reference/html/EntangleControlText.html (+5/-5)
docs/reference/html/EntangleControlToggle.html (+5/-5)
docs/reference/html/EntangleDeviceManager.html (+9/-9)
docs/reference/html/EntangleHelpAbout.html (+18/-21)
docs/reference/html/EntangleImage.html (+7/-7)
docs/reference/html/EntangleImageDisplay.html (+44/-44)
docs/reference/html/EntangleImageHistogram.html (+6/-6)
docs/reference/html/EntangleImageLoader.html (+7/-7)
docs/reference/html/EntangleImagePopup.html (+22/-15)
docs/reference/html/EntangleImageStatusbar.html (+2/-2)
docs/reference/html/EntanglePixbufLoader.html (+19/-19)
docs/reference/html/EntanglePreferences.html (+101/-101)
docs/reference/html/EntanglePreferencesDisplay.html (+16/-40)
docs/reference/html/EntangleSession.html (+11/-11)
docs/reference/html/EntangleSessionBrowser.html (+176/-12)
docs/reference/html/EntangleThumbnailLoader.html (+5/-5)
docs/reference/html/annotation-glossary.html (+12/-1)
docs/reference/html/api-index-full.html (+116/-217)
docs/reference/html/index.sgml (+10/-33)
docs/reference/html/object-tree.html (+28/-22)
entangle.spec (+9/-8)
entangle.spec.in (+8/-7)
m4/libtool.m4 (+9/-3)
po/POTFILES.in (+8/-10)
src/Makefile.am (+17/-13)
src/Makefile.in (+98/-63)
src/backend/entangle-camera-file.c (+2/-2)
src/backend/entangle-camera-list.c (+11/-11)
src/backend/entangle-camera.c (+8/-8)
src/backend/entangle-colour-profile.c (+5/-5)
src/backend/entangle-control-button.c (+3/-4)
src/backend/entangle-control-choice.c (+4/-4)
src/backend/entangle-control-date.c (+3/-3)
src/backend/entangle-control-group.c (+4/-4)
src/backend/entangle-control-range.c (+2/-2)
src/backend/entangle-control-text.c (+2/-2)
src/backend/entangle-control-toggle.c (+2/-2)
src/backend/entangle-control.c (+3/-3)
src/backend/entangle-device-manager.c (+3/-3)
src/backend/entangle-image-loader.c (+1/-1)
src/backend/entangle-image.c (+2/-2)
src/backend/entangle-image.h (+1/-1)
src/backend/entangle-pixbuf-loader.c (+2/-2)
src/backend/entangle-pixbuf-loader.h (+1/-1)
src/backend/entangle-pixbuf.c (+0/-1)
src/backend/entangle-pixbuf.h (+1/-1)
src/backend/entangle-preferences.c (+3/-3)
src/backend/entangle-progress.c (+5/-5)
src/backend/entangle-session.c (+2/-2)
src/backend/entangle-thumbnail-loader.c (+16/-1)
src/entangle-main.c (+2/-2)
src/entangle.appdata.xml (+31/-0)
src/entangle.desktop.in (+3/-3)
src/frontend/entangle-application.c (+12/-14)
src/frontend/entangle-auto-drawer.c (+905/-0)
src/frontend/entangle-auto-drawer.h (+103/-0)
src/frontend/entangle-camera-info.c (+48/-87)
src/frontend/entangle-camera-info.h (+5/-14)
src/frontend/entangle-camera-info.ui (+82/-0)
src/frontend/entangle-camera-info.xml (+0/-82)
src/frontend/entangle-camera-manager.c (+385/-386)
src/frontend/entangle-camera-manager.h (+3/-12)
src/frontend/entangle-camera-manager.ui (+735/-0)
src/frontend/entangle-camera-manager.xml (+0/-690)
src/frontend/entangle-camera-picker.c (+87/-113)
src/frontend/entangle-camera-picker.h (+6/-10)
src/frontend/entangle-camera-picker.ui (+195/-0)
src/frontend/entangle-camera-picker.xml (+0/-195)
src/frontend/entangle-camera-support.c (+46/-82)
src/frontend/entangle-camera-support.h (+3/-10)
src/frontend/entangle-camera-support.ui (+83/-0)
src/frontend/entangle-camera-support.xml (+0/-83)
src/frontend/entangle-control-panel.c (+8/-8)
src/frontend/entangle-drawer.c (+274/-0)
src/frontend/entangle-drawer.h (+79/-0)
src/frontend/entangle-help-about.c (+50/-74)
src/frontend/entangle-help-about.h (+2/-7)
src/frontend/entangle-help-about.ui (+671/-0)
src/frontend/entangle-help-about.xml (+0/-670)
src/frontend/entangle-image-display.c (+27/-11)
src/frontend/entangle-image-histogram.c (+7/-7)
src/frontend/entangle-image-popup.c (+68/-76)
src/frontend/entangle-image-popup.h (+2/-3)
src/frontend/entangle-image-popup.ui (+20/-0)
src/frontend/entangle-image-popup.xml (+0/-19)
src/frontend/entangle-image-statusbar.c (+1/-1)
src/frontend/entangle-overlay-box.c (+810/-0)
src/frontend/entangle-overlay-box.h (+95/-0)
src/frontend/entangle-preferences-display.c (+93/-165)
src/frontend/entangle-preferences-display.h (+4/-9)
src/frontend/entangle-preferences-display.ui (+959/-0)
src/frontend/entangle-preferences.xml (+0/-959)
src/frontend/entangle-session-browser.c (+112/-49)
src/frontend/entangle-session-browser.h (+1/-0)
src/frontend/entangle-window.c (+111/-0)
src/frontend/entangle-window.h (+70/-0)
src/frontend/view/autoDrawer.c (+0/-997)
src/frontend/view/autoDrawer.h (+0/-91)
src/frontend/view/drawer.c (+0/-361)
src/frontend/view/drawer.h (+0/-83)
src/frontend/view/ovBox.c (+0/-947)
src/frontend/view/ovBox.h (+0/-103)