Merge branch '0.5.0.x' into 0.5.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 3 Jan 2012 17:23:09 +0000 (12:23 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 3 Jan 2012 17:23:09 +0000 (12:23 -0500)
1  2 
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_es_CL.ts
src/util.h

Simple merge
Simple merge
diff --cc src/util.h
Simple merge