Luke Dashjr 661ca4136c Merge branch '0.6.0.x' into 0.6.x ...

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

2012-08-27 19:20:30 +00:00

..

pixmaps

Re-add bitcoin(32&80).xpm

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

qt

fix warnings: unused variable 'XX' [-Wunused-variable]

2012-04-15 13:40:14 +02:00

genbuild.sh

Build identification strings

2012-04-10 18:16:53 +02:00

setup.nsi

Merge branch '0.6.0.x' into 0.6.x

2012-08-27 19:20:30 +00:00

ui.rc

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

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