changeset 2952:5e3bf1b56472 draft

Merge branch '0.5.x' into 0.6.0.x Conflicts: contrib/gitian-descriptors/gitian-win32.yml
author Luke Dashjr <luke-jr+git@utopios.org>
date Fri, 27 Apr 2012 13:57:43 -0400
parents 6f65064fcec4 (current diff) 78da0809f0f9 (diff)
children 745ef072286e
files contrib/gitian-descriptors/gitian-win32.yml doc/build-msw.txt doc/release-process.txt src/makefile.linux-mingw src/makefile.mingw
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff