]> git.saurik.com Git - wxWidgets.git/commit
projects / wxWidgets.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fac7f64) | patch
last commit resolved the conflict incorrectly, undoing it
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 30 Nov 2007 20:16:40 +0000 (20:16 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 30 Nov 2007 20:16:40 +0000 (20:16 +0000)
commit6efc1b30d6ecd3dbae05a562a40ce48d3c3b5f7b
tree749b844e3890078554f41e606737b7aaeda8f167tree | snapshot
parentfac7f644e2c46168555cfeda70feb9cfe46a179ecommit | diff
last commit resolved the conflict incorrectly, undoing it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/common/dcbufcmn.cpp diff | blob | blame | history
wxWidgets (Impactor)