[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2995-g4729b3f

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4729b3f811c4c44b00ea2342e804089a571b6a19 (commit)
       via  482b867b78cf44ceade942c509aae184f30a36dc (commit)
      from  710e2e6015099b279c2a46c548b17d0ec4365c10 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4729b3f811c4c44b00ea2342e804089a571b6a19
commit 4729b3f811c4c44b00ea2342e804089a571b6a19
Merge: 710e2e6 482b867
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed May 7 14:47:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 14:47:51 2014 -0400

    Merge topic 'desktop-icon' into next
    
    482b867b Fix desktop file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=482b867b78cf44ceade942c509aae184f30a36dc
commit 482b867b78cf44ceade942c509aae184f30a36dc
Author:     Johannes Huber <johu at gentoo.org>
AuthorDate: Wed May 7 13:43:58 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed May 7 20:47:36 2014 +0200

    Fix desktop file
    
    Drops the icon file extension. Fixes the desktop file validation message:
    
    "CMakeSetup32.png" for key "Icon" in group "Desktop Entry" is an icon
    name with an extension, but there should be no extension as described in
    the Icon Theme Specification if the value is not an absolute path

diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
index 645eb76..7be495f 100644
--- a/Source/QtDialog/CMake.desktop
+++ b/Source/QtDialog/CMake.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=CMake
 Comment=Cross-platform buildsystem
 Exec=cmake-gui %f
-Icon=CMakeSetup32.png
+Icon=CMakeSetup32
 Terminal=false
 X-MultipleArgs=false
 Type=Application

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake