projects / wxWidgets.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b527905) | patch
Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in
authorRobin Dunn <robin@alldunn.com>
Fri, 7 Aug 1998 17:32:54 +0000 (17:32 +0000)
committerRobin Dunn <robin@alldunn.com>
Fri, 7 Aug 1998 17:32:54 +0000 (17:32 +0000)
commit35eca07ccdca92126687b86c6d290f5b9b937422
tree7470d892239be042c31fe6a82254fdc1990c6594tree
parentb5279053f65f2f4f7352d2a74c787096073e3ad6commit | diff
Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in
the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/msw/notebook.h diff | blob | blame | history
wxWidgets (Impactor)