Merge pull request #3432

b960fcb [Qt] update bitcoin-qt.pro and assets-attribution.md (Philip Kaufmann)

contrib/bitcoin-qt.pro

@@ -1,19 +1,20 @@
 FORMS += \
-    ../src/qt/forms/transactiondescdialog.ui \
-    ../src/qt/forms/signverifymessagedialog.ui \
-    ../src/qt/forms/sendcoinsentry.ui \
-    ../src/qt/forms/sendcoinsdialog.ui \
-    ../src/qt/forms/rpcconsole.ui \
-    ../src/qt/forms/overviewpage.ui \
-    ../src/qt/forms/optionsdialog.ui \
-    ../src/qt/forms/intro.ui \
-    ../src/qt/forms/editaddressdialog.ui \
-    ../src/qt/forms/askpassphrasedialog.ui \
-    ../src/qt/forms/addressbookpage.ui \
     ../src/qt/forms/aboutdialog.ui \
+    ../src/qt/forms/addressbookpage.ui \
+    ../src/qt/forms/askpassphrasedialog.ui \
+    ../src/qt/forms/coincontroldialog.ui \
+    ../src/qt/forms/editaddressdialog.ui \
+    ../src/qt/forms/intro.ui \
+    ../src/qt/forms/openuridialog.ui \
+    ../src/qt/forms/optionsdialog.ui \
+    ../src/qt/forms/overviewpage.ui \
     ../src/qt/forms/receivecoinsdialog.ui \
     ../src/qt/forms/receiverequestdialog.ui \
-    ../src/qt/forms/openuridialog.ui
+    ../src/qt/forms/rpcconsole.ui \
+    ../src/qt/forms/sendcoinsdialog.ui \
+    ../src/qt/forms/sendcoinsentry.ui \
+    ../src/qt/forms/signverifymessagedialog.ui \
+    ../src/qt/forms/transactiondescdialog.ui \
 
 RESOURCES += \
     ../src/qt/bitcoin.qrc

doc/assets-attribution.md

@@ -4,29 +4,29 @@ The following is a list of assets used in the bitcoin source and their proper at
 -----------------------
 #### Info
 * License: MIT
-### Assets Used
 
-		src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
-		src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg,
-		src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg,
-		src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg,
-		src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
+### Assets Used
+	src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
+	src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg,
+	src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg,
+	src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg,
+	src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
 
-[David Vignoni](www.icon-king.com)
+[David Vignoni](http://www.icon-king.com)
 -----------------------
 
 ### Info
 * Icon Pack: NUVOLA ICON THEME for KDE 3.x
 * Designer: David Vignoni (david@icon-king.com)
 * License: LGPL
-* Site: [http://www.icon-king.com/projects/nuvola/](http://www.icon-king.com/projects/nuvola/)
+* Site: [http://www.icon-king.com/projects/nuvola](http://www.icon-king.com/projects/nuvola)
 
 ### Assets Used
-	  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/filesave.png
+	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/filesave.png
 
 schollidesign
 -----------------------
@@ -38,17 +38,16 @@ schollidesign
 * Site: [http://findicons.com/icon/93743/blocks_gnome_netstatus_0](http://findicons.com/icon/93743/blocks_gnome_netstatus_0)
 
 ### Assets Used
-	 src/qt/res/icons/connect*.png
+	src/qt/res/icons/connect*.png
 
 md2k7
 -----------------------
 
 ### Info
 * Designer: md2k7
-* Site: https://bitcointalk.org/index.php?topic=15276.0
-* License: You are free to do with these icons as you wish, including selling,
- copying, modifying etc.
+* License: You are free to do with these icons as you wish, including selling, copying, modifying etc.
 * License: MIT
+* Site: [https://bitcointalk.org/index.php?topic=15276.0](https://bitcointalk.org/index.php?topic=15276.0)
 
 ### Assets Used
 	src/qt/res/icons/transaction*.png
@@ -57,15 +56,15 @@ md2k7
 -----------------------
 
 ### Info
-* Designer: [http://www.everaldo.com](http://www.everaldo.com)
 * Icon Pack: Crystal SVG
+* Designer: [http://www.everaldo.com](http://www.everaldo.com)
 * License: LGPL
 
 ### Assets Used
 	src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
-    src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
-    src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
-    src/qt/res/icons/remove.png (edited)
+	src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
+	src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
+	src/qt/res/icons/remove.png (edited)
 
 Everaldo (Everaldo Coelho)
 -----------------------
@@ -75,16 +74,17 @@ Everaldo (Everaldo Coelho)
 * Designer: Everaldo (Everaldo Coelho)
 * License: GNU/GPL 
 * Site: [http://findicons.com/icon/17102/reload?id=17102](http://findicons.com/icon/17102/reload?id=17102)
+
 ### Assets Used
 	scripts/img/reload.xcf (modified), src/qt/res/movies/update_spinner.mng
 
-[Vignoni David](http://www.oxygen-icons.org/)
+[Vignoni David](http://www.oxygen-icons.org)
 -----------------------
 
 ### Info
 * Designer: Vignoni David
-* Site: http://www.oxygen-icons.org/
 * License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
+* Site: [http://www.oxygen-icons.org](http://www.oxygen-icons.org)
 
 ### Assets Used
 	src/qt/res/icons/debugwindow.png