projects / wxWidgets.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95fbc73) | patch
Remove left over conflict markers from documentation.
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 15 Jun 2012 23:23:20 +0000 (23:23 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 15 Jun 2012 23:23:20 +0000 (23:23 +0000)
commitd6cf9064d4e7e342e99f368c38f9affc63c9bceb
tree012cf206d1e9179b498e0ded239bbbd2aa892853tree
parent95fbc73897ecae0a1d32d61cc9af418298f973c8commit | diff
Remove left over conflict markers from documentation.

Closes #14404.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
interface/wx/propgrid/property.h diff | blob | blame | history
wxWidgets (Impactor)