Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegraphics

11 years ago · 9d92ddd4eb
parent 642b172d8e fa6ad46935
commit 9d92ddd4eb
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
--- a/kamera/pics/CMakeLists.txt
+++ b/kamera/pics/CMakeLists.txt
@ -9,5 +9,5 @@
 #
 #################################################
-tde_install_icons( camera )
+tde_install_icons( camera-photo )
 tde_install_icons( camera_test )
--- a/kamera/pics/Makefile.am
+++ b/kamera/pics/Makefile.am
@ -1 +1 @@
-KDE_ICON = camera camera_test
+KDE_ICON = camera-photo camera_test
		`@ -1 +1 @@`
			`Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9`				`Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c`
`@ -1 +1 @@`
	`KDE_ICON = camera camera_test`	`KDE_ICON = camera-photo camera_test`