changeset 2951:78da0809f0f9 draft

Merge branch '0.4.x' into 0.5.x Conflicts: doc/build-msw.txt src/makefile.linux-mingw src/makefile.mingw
author Luke Dashjr <luke-jr+git@utopios.org>
date Fri, 27 Apr 2012 13:52:02 -0400
parents 5e8dd82242a3 (current diff) 27fb3fc934de (diff)
children 5e3bf1b56472 e128a56635d5
files contrib/gitian-descriptors/gitian-win32.yml doc/build-msw.txt src/makefile.linux-mingw src/makefile.mingw
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff