Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 32 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
deleted file mode 100644
index fe6cf12..0000000
--- a/ui/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-dist_noinst_DATA = \
-	collection.ui \
-	direct_context.ui \
-	direct.ui \
-	events_directory.ui \
-	event.ui \
-	fullscreen.ui \
-	import_queue.ui \
-	import.ui \
-	manifest_widget.ui \
-	media.ui \
-	multitextentrydialog.ui \
-	offline.ui \
-	photo_context.ui \
-	photo.ui \
-	preferences_dialog.ui \
-	printing_widget.ui \
-	saved_search_dialog.ui \
-	savedsearch.ui \
-	search_bar.ui \
-	search_sidebar_context.ui \
-	set_background_dialog.ui \
-	set_background_slideshow_dialog.ui \
-	shotwell.ui \
-	sidebar_default_context.ui \
-	slideshow_settings.ui \
-	tag_sidebar_context.ui \
-	tags.ui \
-	textentrydialog.ui \
-	trash.ui
-
--include $(top_srcdir)/git.mk