diff options
| author | Timothy Pearson <[email protected]> | 2014-10-12 17:56:50 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-12 17:56:50 -0500 |
| commit | 9d92ddd4eb00dd2a8446f9307e0f2d0690a3b723 (patch) | |
| tree | 20c4811675446e8461ccc4967d3ab9f53b27d5b9 | |
| parent | 642b172d8e5f3d8ce905b71c5772da30fb215ae7 (diff) | |
| parent | fa6ad46935946ba6fed688a78ab92735871ed9be (diff) | |
| download | tdegraphics-9d92ddd4eb00dd2a8446f9307e0f2d0690a3b723.tar.gz tdegraphics-9d92ddd4eb00dd2a8446f9307e0f2d0690a3b723.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdegraphics
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | kamera/pics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kamera/pics/Makefile.am | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/cmake b/cmake -Subproject 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac +Subproject 08c6f54d6f80554caa671847417cf04326adb63 diff --git a/kamera/pics/CMakeLists.txt b/kamera/pics/CMakeLists.txt index b42c7419..34b473a7 100644 --- 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 ) diff --git a/kamera/pics/Makefile.am b/kamera/pics/Makefile.am index b74ac1ca..6fb78919 100644 --- a/kamera/pics/Makefile.am +++ b/kamera/pics/Makefile.am @@ -1 +1 @@ -KDE_ICON = camera camera_test +KDE_ICON = camera-photo camera_test |