Merge branch 'msvc'
authorPeter Rosin <peda@lysator.liu.se>
Mon, 16 Aug 2010 20:06:07 +0000 (22:06 +0200)
committerPeter Rosin <peda@lysator.liu.se>
Mon, 16 Aug 2010 20:06:07 +0000 (22:06 +0200)
1  2 
ChangeLog

diff --cc ChangeLog
Simple merge