Reverted conflict with Darwin.
authorWłodzimierz Skiba <abx@abx.art.pl>
Tue, 12 Oct 2004 20:14:23 +0000 (20:14 +0000)
committerWłodzimierz Skiba <abx@abx.art.pl>
Tue, 12 Oct 2004 20:14:23 +0000 (20:14 +0000)
commit05689a13cc183d26a54c4a082bc5a6d6efd177e4
tree0a4c550be2027a033b1c872439f8378dc2d57615
parentecd9653bf363d756f479d30fb8af11229681d74e
Reverted conflict with Darwin.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/choice.h
src/common/choiccmn.cpp