diff options
author | Darrell Anderson <[email protected]> | 2013-03-03 23:23:14 -0600 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2013-03-03 23:23:14 -0600 |
commit | d23c1d255cb712188defb3016ccb8c728cefb89c (patch) | |
tree | 2322626d3d8a0fc45a01359320f74df7a4858db1 /setup.py | |
parent | 994856363055df4dd5ae2e0464c0e8b951b65277 (diff) | |
parent | 0305e778e8060720a09eaf2d8d2b7356e52b6b89 (diff) | |
download | fusion-icon-d23c1d255cb712188defb3016ccb8c728cefb89c.tar.gz fusion-icon-d23c1d255cb712188defb3016ccb8c728cefb89c.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/fusion-icon
Conflicts:
admin
cmake
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions