← Back to branch summary

~noskcaj/ubuntu/trusty/entangle/merge

~noskcaj/ubuntu/trusty/entangle/merge

Viewing all changes in revision 10.

Committer: Jackson Doak
Date: 2013-12-18 04:59:01 UTC
mfrom: (4.1.4 sid)
Revision ID: noskcaj@ubuntu.com-20131218045901-m2t6ivz72e7b0az4

* Merge from debian unstable. Remaining changes:
- debian/control: B-dep on libgphoto2-6 instead of libgphoto2-2

files added:
src/entangle.appdata.xml

src/frontend/entangle-auto-drawer.c

src/frontend/entangle-auto-drawer.h

src/frontend/entangle-camera-info.ui

src/frontend/entangle-camera-manager.ui

src/frontend/entangle-camera-picker.ui

src/frontend/entangle-camera-support.ui

src/frontend/entangle-drawer.c

src/frontend/entangle-drawer.h

src/frontend/entangle-help-about.ui

src/frontend/entangle-image-popup.ui

src/frontend/entangle-overlay-box.c

src/frontend/entangle-overlay-box.h

src/frontend/entangle-preferences-display.ui

src/frontend/entangle-window.c

src/frontend/entangle-window.h

files removed:
src/frontend/entangle-camera-info.xml

src/frontend/entangle-camera-manager.xml

src/frontend/entangle-camera-picker.xml

src/frontend/entangle-camera-support.xml

src/frontend/entangle-help-about.xml

src/frontend/entangle-image-popup.xml

src/frontend/entangle-preferences.xml

src/frontend/view

src/frontend/view/autoDrawer.c

src/frontend/view/autoDrawer.h

src/frontend/view/drawer.c

src/frontend/view/drawer.h

src/frontend/view/ovBox.c

src/frontend/view/ovBox.h

files modified:
AUTHORS

ChangeLog

NEWS

README

cfg.mk

configure

configure.ac

debian/changelog

debian/control

docs/man/en/entangle.1

docs/reference/Entangle-sections.txt

docs/reference/Entangle.types

docs/reference/html/Entangle-entangle-debug.html

docs/reference/html/Entangle-entangle-dpms.html

docs/reference/html/Entangle-entangle-pixbuf.html

docs/reference/html/Entangle.devhelp2

docs/reference/html/EntangleApplication.html

docs/reference/html/EntangleCamera.html

docs/reference/html/EntangleCameraFile.html

docs/reference/html/EntangleCameraInfo.html

docs/reference/html/EntangleCameraList.html

docs/reference/html/EntangleCameraManager.html

docs/reference/html/EntangleCameraPicker.html

docs/reference/html/EntangleCameraSupport.html

docs/reference/html/EntangleColourProfile.html

docs/reference/html/EntangleControl.html

docs/reference/html/EntangleControlButton.html

docs/reference/html/EntangleControlChoice.html

docs/reference/html/EntangleControlDate.html

docs/reference/html/EntangleControlGroup.html

docs/reference/html/EntangleControlPanel.html

docs/reference/html/EntangleControlRange.html

docs/reference/html/EntangleControlText.html

docs/reference/html/EntangleControlToggle.html

docs/reference/html/EntangleDeviceManager.html

docs/reference/html/EntangleHelpAbout.html

docs/reference/html/EntangleImage.html

docs/reference/html/EntangleImageDisplay.html

docs/reference/html/EntangleImageHistogram.html

docs/reference/html/EntangleImageLoader.html

docs/reference/html/EntangleImagePopup.html

docs/reference/html/EntangleImageStatusbar.html

docs/reference/html/EntanglePixbufLoader.html

docs/reference/html/EntanglePreferences.html

docs/reference/html/EntanglePreferencesDisplay.html

docs/reference/html/EntangleSession.html

docs/reference/html/EntangleSessionBrowser.html

docs/reference/html/EntangleThumbnailLoader.html

docs/reference/html/annotation-glossary.html

docs/reference/html/api-index-full.html

docs/reference/html/index.sgml

docs/reference/html/object-tree.html

entangle.spec

entangle.spec.in

m4/libtool.m4

po/POTFILES.in

src/Makefile.am

src/Makefile.in

src/backend/entangle-camera-file.c

src/backend/entangle-camera-list.c

src/backend/entangle-camera.c

src/backend/entangle-colour-profile.c

src/backend/entangle-control-button.c

src/backend/entangle-control-choice.c

src/backend/entangle-control-date.c

src/backend/entangle-control-group.c

src/backend/entangle-control-range.c

src/backend/entangle-control-text.c

src/backend/entangle-control-toggle.c

src/backend/entangle-control.c

src/backend/entangle-device-manager.c

src/backend/entangle-image-loader.c

src/backend/entangle-image.c

src/backend/entangle-image.h

src/backend/entangle-pixbuf-loader.c

src/backend/entangle-pixbuf-loader.h

src/backend/entangle-pixbuf.c

src/backend/entangle-pixbuf.h

src/backend/entangle-preferences.c

src/backend/entangle-progress.c

src/backend/entangle-session.c

src/backend/entangle-thumbnail-loader.c

src/entangle-main.c

src/entangle.desktop.in

src/frontend/entangle-application.c

src/frontend/entangle-camera-info.c

src/frontend/entangle-camera-info.h

src/frontend/entangle-camera-manager.c

src/frontend/entangle-camera-manager.h

src/frontend/entangle-camera-picker.c

src/frontend/entangle-camera-picker.h

src/frontend/entangle-camera-support.c

src/frontend/entangle-camera-support.h

src/frontend/entangle-control-panel.c

src/frontend/entangle-help-about.c

src/frontend/entangle-help-about.h

src/frontend/entangle-image-display.c

src/frontend/entangle-image-histogram.c

src/frontend/entangle-image-popup.c

src/frontend/entangle-image-popup.h

src/frontend/entangle-image-statusbar.c

src/frontend/entangle-preferences-display.c

src/frontend/entangle-preferences-display.h

src/frontend/entangle-session-browser.c

src/frontend/entangle-session-browser.h

Show diffs side-by-side

added added

removed removed

debian/changelog

docs/man/en/entangle.1

docs/reference/Entangle-sections.txt

docs/reference/Entangle.types

docs/reference/html/Entangle-entangle-debug.html

docs/reference/html/Entangle-entangle-dpms.html

docs/reference/html/Entangle-entangle-pixbuf.html

docs/reference/html/Entangle.devhelp2

docs/reference/html/EntangleApplication.html

docs/reference/html/EntangleCamera.html

docs/reference/html/EntangleCameraFile.html

docs/reference/html/EntangleCameraInfo.html

docs/reference/html/EntangleCameraList.html

docs/reference/html/EntangleCameraManager.html

docs/reference/html/EntangleCameraPicker.html

docs/reference/html/EntangleCameraSupport.html

docs/reference/html/EntangleColourProfile.html

docs/reference/html/EntangleControl.html

docs/reference/html/EntangleControlButton.html

docs/reference/html/EntangleControlChoice.html

docs/reference/html/EntangleControlDate.html

docs/reference/html/EntangleControlGroup.html

docs/reference/html/EntangleControlPanel.html

docs/reference/html/EntangleControlRange.html

docs/reference/html/EntangleControlText.html

docs/reference/html/EntangleControlToggle.html

docs/reference/html/EntangleDeviceManager.html

docs/reference/html/EntangleHelpAbout.html

docs/reference/html/EntangleImage.html

docs/reference/html/EntangleImageDisplay.html

docs/reference/html/EntangleImageHistogram.html

docs/reference/html/EntangleImageLoader.html

docs/reference/html/EntangleImagePopup.html

docs/reference/html/EntangleImageStatusbar.html

docs/reference/html/EntanglePixbufLoader.html

docs/reference/html/EntanglePreferences.html

docs/reference/html/EntanglePreferencesDisplay.html

docs/reference/html/EntangleSession.html

docs/reference/html/EntangleSessionBrowser.html

docs/reference/html/EntangleThumbnailLoader.html

docs/reference/html/annotation-glossary.html

docs/reference/html/api-index-full.html

docs/reference/html/index.sgml

docs/reference/html/object-tree.html

entangle.spec.in

src/Makefile.am

src/Makefile.in

src/backend/entangle-camera-file.c

src/backend/entangle-camera-list.c

src/backend/entangle-camera.c

src/backend/entangle-colour-profile.c

src/backend/entangle-control-button.c

src/backend/entangle-control-choice.c

src/backend/entangle-control-date.c

src/backend/entangle-control-group.c

src/backend/entangle-control-range.c

src/backend/entangle-control-text.c

src/backend/entangle-control-toggle.c

src/backend/entangle-control.c

src/backend/entangle-device-manager.c

src/backend/entangle-image-loader.c

src/backend/entangle-image.c

src/backend/entangle-image.h

src/backend/entangle-pixbuf-loader.c

src/backend/entangle-pixbuf-loader.h

src/backend/entangle-pixbuf.c

src/backend/entangle-pixbuf.h

src/backend/entangle-preferences.c

src/backend/entangle-progress.c

src/backend/entangle-session.c

src/backend/entangle-thumbnail-loader.c

src/entangle-main.c

src/entangle.appdata.xml

src/entangle.desktop.in

src/frontend/entangle-application.c

src/frontend/entangle-auto-drawer.c

src/frontend/entangle-auto-drawer.h

src/frontend/entangle-camera-info.c

src/frontend/entangle-camera-info.h

src/frontend/entangle-camera-info.ui

src/frontend/entangle-camera-info.xml

src/frontend/entangle-camera-manager.c

src/frontend/entangle-camera-manager.h

src/frontend/entangle-camera-manager.ui

src/frontend/entangle-camera-manager.xml

src/frontend/entangle-camera-picker.c

src/frontend/entangle-camera-picker.h

src/frontend/entangle-camera-picker.ui

src/frontend/entangle-camera-picker.xml

src/frontend/entangle-camera-support.c

src/frontend/entangle-camera-support.h

src/frontend/entangle-camera-support.ui

src/frontend/entangle-camera-support.xml

src/frontend/entangle-control-panel.c

src/frontend/entangle-drawer.c

src/frontend/entangle-drawer.h

src/frontend/entangle-help-about.c

src/frontend/entangle-help-about.h

src/frontend/entangle-help-about.ui

src/frontend/entangle-help-about.xml

src/frontend/entangle-image-display.c

src/frontend/entangle-image-histogram.c

src/frontend/entangle-image-statusbar.c

src/frontend/entangle-overlay-box.c

src/frontend/entangle-overlay-box.h

src/frontend/entangle-preferences-display.c

src/frontend/entangle-preferences-display.h

src/frontend/entangle-preferences-display.ui

src/frontend/entangle-preferences.xml

src/frontend/entangle-session-browser.c

src/frontend/entangle-session-browser.h

src/frontend/entangle-window.c

src/frontend/entangle-window.h

src/frontend/view/

src/frontend/view/autoDrawer.c

src/frontend/view/autoDrawer.h

src/frontend/view/drawer.c

src/frontend/view/drawer.h

src/frontend/view/ovBox.c

src/frontend/view/ovBox.h

Older »