Luke Dashjr f08ad34e0c Merge branch '0.5.x' into 0.6.0.x ...

Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h

2012-08-27 19:14:59 +00:00

..

pixmaps

Re-add bitcoin(32&80).xpm

2011-11-08 11:43:37 -05:00

setup.nsi

Merge branch '0.5.x' into 0.6.0.x

2012-08-27 19:14:59 +00:00

ui.rc

Fix MinGW build due to bad pointers to ui.rc pixmaps stuff.

2011-05-14 18:51:52 +02:00