]> git.saurik.com Git - wxWidgets.git/commit
resolving conflicts in files I had forgot to commit (sorry)
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 8 Feb 2004 22:04:51 +0000 (22:04 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 8 Feb 2004 22:04:51 +0000 (22:04 +0000)
commita6c811617b84695050e16f09b4fee518c89665a7
tree3b80d62844256c0d719b307c7e0b84e46aac4ee8
parent5a30d45018a98ee9355c9585dbc1cdfe07aeb2d2
resolving conflicts in files I had forgot to commit (sorry)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/msw/listctrl.h
src/msw/pen.cpp