added wxTextAttr::Merge (modified patch 1482719)
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 6 May 2006 16:16:25 +0000 (16:16 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 6 May 2006 16:16:25 +0000 (16:16 +0000)
commit53ee60908a7b7dcd6d5e6bd4fa3cf606b60ea20c
tree834a94e8bc3813b7ba26e9bbe11e3631e9d866e9
parent6e86472fa5158aac0f559c6e397d1a56725943dc
added wxTextAttr::Merge (modified patch 1482719)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
docs/changes.txt
docs/latex/wx/text.tex
include/wx/textctrl.h