highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-26 14:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.0.x' into 0.5.x

Browse Source 
Conflicts:
	src/qt/notificator.h
This commit is contained in:
Luke Dashjr
2012-04-06 16:34:34 -04:00
parent 0d10cb7a1f bf1f995c4c
commit 892fcaf291
8 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/assets-attribution.txt
View File

@@ -1,3 +1,7 @@
Code: src/strlcpy.h
Author: Todd C. Miller <Todd.Miller@courtesan.com>
License: ISC
Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
src/qt/res/src/*.svg
Designer: Wladimir van der Laan