[Xfce4-commits] <xfce4-cpugraph-plugin:master> Merge branch 'taskbranch/bug-6700'

[Florian Rivoal]

Updating branch refs/heads/master
         to 7ed44cb4ff4c7385d8ad8afac42bfd9ba8c854df (commit)
       from f4026184946a33c725414d635de96a709b53a730 (commit)

commit 7ed44cb4ff4c7385d8ad8afac42bfd9ba8c854df
Merge: f4026184946a33c725414d635de96a709b53a730 2dcfd3d41dd34a4acabc55309be88ee5fed6bc45
Author: Florian Rivoal <frivoal at gmail.com>
Date:   Thu Oct 7 01:18:38 2010 +0900

    Merge branch 'taskbranch/bug-6700'

commit 2dcfd3d41dd34a4acabc55309be88ee5fed6bc45
Author: Florian Rivoal <frivoal at gmail.com>
Date:   Thu Oct 7 01:14:49 2010 +0900

    Improve the properties dialog
    
    Use an Xfce style dialog for the properties. This makes it prettier, in
    large part due to the new icons.
    
    This is a dummy commit, as the actual change was actually included in
    the previous commit, but the commit message didn't reflect this.