resolved conflict (because I forgot to commit before)
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 26 Nov 2003 20:01:54 +0000 (20:01 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 26 Nov 2003 20:01:54 +0000 (20:01 +0000)
commit4bdce112bfdf754b965bc999df182ee9aafac2fb
tree4ef2d928af1553400a1680db698bc2bd02b44cbe
parent5de65c69302144824356ad94a659ffa539cf4139
resolved conflict (because I forgot to commit before)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/html/htmlwin.h