fixed merge problem
authorMarina Kolpakova <no@email>
Thu, 28 Jun 2012 17:54:08 +0000 (17:54 +0000)
committerMarina Kolpakova <no@email>
Thu, 28 Jun 2012 17:54:08 +0000 (17:54 +0000)
commit37a63523e7abf388461fefd022b21efdaaf35fd8
tree4e9463fb0214f26f4e7f51ec4b36baa144287f57
parenta71797c0c4b8d76c9cea9dcad57e7efe36226070
fixed merge problem
modules/gpu/perf/perf_core.cpp [deleted file]