Merge branch 'master' of http://wagner.pp.ru/git/oss/catdoc
authorVictor Wagner <vitus@wagner.pp.ru>
Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Thu, 28 Apr 2016 04:34:58 +0000 (07:34 +0300)
1  2 
src/ole.c
src/substmap.c

diff --cc src/ole.c
Simple merge
diff --cc src/substmap.c
Simple merge