]> git.saurik.com Git - wxWidgets.git/commit
projects / wxWidgets.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8e05125) | patch
fixed merge conflict
authorRobin Dunn <robin@alldunn.com>
Mon, 17 Jul 2006 21:45:30 +0000 (21:45 +0000)
committerRobin Dunn <robin@alldunn.com>
Mon, 17 Jul 2006 21:45:30 +0000 (21:45 +0000)
commitca1863c2ccc5f51f1f0f77466d2cd4985d917488
tree9790eb69ac4689cf5e1008cdc705b4214e90a235tree | snapshot
parent8e051259815301a795428518cf2b76a8bfd25939commit | diff
fixed merge conflict

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
wxPython/docs/CHANGES.txt diff | blob | blame | history
wxWidgets (Impactor)