]> git.saurik.com Git - wxWidgets.git/commit
compilation fix after incorrectly resolved conflict
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Dec 1999 21:59:02 +0000 (21:59 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Dec 1999 21:59:02 +0000 (21:59 +0000)
commitd5e295970c3c7e0da478425c59cc176a5cfb71d8
tree4f6695e953b73407f4d0f7552d6517b1666e0cd8
parent7521ca7d84a20fa75957463100c26d49789ff0c1
compilation fix after incorrectly resolved conflict

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