diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-27 13:52:02 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-27 13:52:02 -0400 |
| commit | 824e8dde8b20854b9f0e25aa93dd4ae8c06e3877 (patch) | |
| tree | 1898cf2e76cb0024d123470228877ba4a4edffb9 | |
| parent | b7a2b6e1aa3d2b5fc8240dc0fd3a0e8acb213775 (diff) | |
| parent | 5ad4028050d54be1bf60b99dc4edaa2a984f959b (diff) | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
doc/build-msw.txt
src/makefile.linux-mingw
src/makefile.mingw
0 files changed, 0 insertions, 0 deletions