changed conditions for conflicts
authorpavelpa <pavelpa@localhost>
Thu, 28 Jan 2010 13:02:35 +0000 (13:02 +0000)
committerpavelpa <pavelpa@localhost>
Thu, 28 Jan 2010 13:02:35 +0000 (13:02 +0000)
commit8cb5c4f196fb5ebdf54c43932c2ddb14bf22245b
tree75c3cd63017a8a479bc4f167db6225666639e392
parent412cef6f84e31a76b3efd69e64fe83400c8ed8d0
changed conditions for conflicts
src/mvc/event.cpp