Merge branch '0.5.x' into 0.6.0.x
[novacoin.git] / contrib / debian / copyright
index 14e3f4a..71fa77c 100644 (file)
@@ -31,19 +31,19 @@ License: GPL-3+
 Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
        src/qt/res/src/*.svg
 Copyright: Wladimir van der Laan
-License: CC-BY-3
+License: Expat
 
 Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
        src/qt/res/icons/history.png, src/qt/res/icons/key.png,
        src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
        src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
-       src/qt/res/icons/synced.png
+       src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
 Copyright: David Vignoni (david@icon-king.com)
            ICON KING - www.icon-king.com
 License: LGPL
 Comment: NUVOLA ICON THEME for KDE 3.x
          Original icons: kaddressbook, klipper_dock, view-list-text,
-                         key-password, encrypted/decrypted, kfm_home, go-down,
+                         key-password, encrypted/decrypted, go-home, go-down,
                          go-next, dialog-ok
          Site: http://www.icon-king.com/projects/nuvola/
 
@@ -146,13 +146,6 @@ Comment:
  You should have received a copy of the GNU General Public License along
  with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-License: CC-BY-3
- This work is licensed under a Creative Commons Attribution 3.0 Unported
- License.
-Comment:
- You can get a full copy of the license at
- <http://creativecommons.org/licenses/by/3.0/>.
-
 License: LGPL
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by