@mehrdada:
Please run 'bzr merge lp:compiz' once again.
The ABI logic has been improved and probably you have to fix a conflict at the bottom of put.cpp - simply use the new version without the negations, save again and 'bzr resolve plugins/src/put.cpp' and 'bzr push' once you are finished.
@mehrdada:
Please run 'bzr merge lp:compiz' once again.
The ABI logic has been improved and probably you have to fix a conflict at the bottom of put.cpp - simply use the new version without the negations, save again and 'bzr resolve plugins/ src/put. cpp' and 'bzr push' once you are finished.