[Pkg-cli-apps-commits] [SCM] f-spot branch, master-experimental, updated. debian/0.7.0-1-16-g75c0894

[Iain Lane]

The following commit has been merged in the master-experimental branch:
commit 7ea3e41ee178a62eb5f48d6d231e3f30591219ab
Merge: 6a62bc284b8a9f2d4d0c2e5c452f4b018fde8ff1 02642ecba3c6f7948311c38a2a2993b0893e0d5c
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Jul 14 11:38:33 2010 +0100

    Merge commit 'upstream/0.7.1' into master-experimental
    
    Conflicts:
    	build/Makefile.in
    	build/m4/Makefile.in
    	build/pkg-config/Makefile.in
    	build/pkg-config/f-spot.pc.in
    	data/Makefile.in
    	data/desktop-files/Makefile.in
    	data/desktop-files/f-spot-import.desktop
    	data/desktop-files/f-spot-import.desktop.in
    	data/desktop-files/f-spot-view.desktop
    	data/desktop-files/f-spot-view.desktop.in
    	data/desktop-files/f-spot.desktop
    	data/desktop-files/f-spot.desktop.in
    	extensions/Editors/Makefile.in
    	extensions/Exporters/FacebookExport/Mono.Facebook/SessionInfo.cs
    	extensions/Exporters/GalleryExport/FormClient.cs
    	extensions/Exporters/TabbloExport/ui/TabbloExport.ui
    	extensions/Exporters/TabbloExport/ui/TrustError.ui
    	lib/Hyena/src/Hyena.Data.Sqlite/Hyena.Metrics/ISampleStore.cs
    	lib/Hyena/src/Hyena.Data.Sqlite/Hyena.Metrics/MemorySampleStore.cs
    	lib/Hyena/src/Hyena.Data.Sqlite/Hyena.Metrics/Sample.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/IInteractiveCell.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/IListView.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/ITextCell.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/ITooltipCell.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Gui.Theming/ThemeEngine.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Gui/TestModuleAttribute.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/NullQueryValueEntry.cs
    	lib/Hyena/src/Hyena.Gui/Hyena.Query.Gui/StringQueryValueEntry.cs
    	lib/Hyena/src/Hyena/Hyena.Collections/WriteLineElement.cs
    	lib/Hyena/src/Hyena/Hyena.Data/ISelectable.cs
    	lib/Hyena/src/Hyena/Hyena.Jobs/Resource.cs
    	lib/Hyena/src/Hyena/Hyena.Json/IJsonCollection.cs
    	lib/Hyena/src/Hyena/Hyena.Json/JsonObject.cs
    	lib/Hyena/src/Hyena/Hyena.Json/TokenType.cs
    	lib/Hyena/src/Hyena/Hyena.Query/ExactUriStringQueryValue.cs
    	lib/Hyena/src/Hyena/Hyena.Query/QueryOrder.cs
    	lib/Hyena/src/Hyena/Hyena.Query/QueryParser.cs
    	lib/Hyena/src/Hyena/Hyena.SExpEngine/Evaluator.cs
    	lib/Hyena/src/Hyena/Hyena/IUndoAction.cs
    	lib/Hyena/src/Hyena/Hyena/Log.cs
    	lib/Hyena/src/Hyena/Hyena/Timer.cs
    	lib/Hyena/src/Hyena/System.Web/Helpers.cs
    	lib/gio-sharp/gio/FileInfo.custom
    	lib/gtk-sharp-beans/ImageMenuItem.cs
    	lib/libjpegtran/Makefile.in
    	lib/semweb/LiteralFilters.cs
    	lib/semweb/Makefile.am
    	lib/semweb/Makefile.in
    	lib/semweb/Query.cs
    	lib/semweb/RdfReader.cs
    	lib/semweb/SQLStore.cs
    	lib/unique-sharp/Makefile.in
    	lib/unique-sharp/generator/Makefile.in
    	lib/unique-sharp/unique/Makefile.in
    	src/BlockProcessor.cs
    	src/FileBrowsableItem.cs
    	src/Filters/OrientationFilter.cs
    	src/IOChannel.cs
    	src/Imaging/Bim.cs
    	src/Imaging/Exif.cs
    	src/Imaging/JpegFile.cs
    	src/Imaging/JpegHeader.cs
    	src/Imaging/MrwFile.cs
    	src/Imaging/PngFile.cs
    	src/Imaging/PnmFile.cs
    	src/Imaging/SvgFile.cs
    	src/Imaging/X3fFile.cs
    	src/Imaging/XmpFile.cs
    	src/InternalProcess.cs
    	src/MetadataStore.cs
    	src/Query/ConditionWrapper.cs
    	src/Query/Tests/LogicalTermTests.cs
    	src/UI.Dialog/HigMessageDialog.cs
    	src/Utils/DbUtils.cs
    	src/Widgets/ImageDisplay.cs
    	src/XmpTagsImporter.cs


-- 
f-spot