no changes, just resolved a conflict
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 27 Sep 2003 15:40:49 +0000 (15:40 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 27 Sep 2003 15:40:49 +0000 (15:40 +0000)
commit4547faae1dbfbeffb584c1b16b8dd50d1edf26cd
tree6223a80c18eb417c093abc3a5b3961afbf124f7f
parent1bf0f0af622dfcf37052cab975a47036af46e85b
no changes, just resolved a conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
samples/scrollsub/scrollsub.cpp