no changes, just resolved conflicts
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 6 Apr 2001 17:22:04 +0000 (17:22 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 6 Apr 2001 17:22:04 +0000 (17:22 +0000)
commit58d5dfc1685e364e00f032519f01dfe7597c8f46
tree020dd6d87b067510c5712f2b43aa3f2b6ddb9376
parent29e2c38bc565670c013259c66807c9645a6d211d
no changes, just resolved conflicts

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