Please merge trunk, there's a conflict.
Please use '[[:space:]]$' for the regex, then, and there's three more files with whitespace issues when you merge trunk:
./Components/UbuntuShapeForItem.qml: trailing whitespace ./runtests.sh: trailing whitespace ./plugins/Unity/categories.cpp: trailing whitespace
Components/UbuntuShapeForItem.qml actually has \r\n - should be converted to unix newlines.
« Back to merge proposal
Please merge trunk, there's a conflict.
Please use '[[:space:]]$' for the regex, then, and there's three more files with whitespace issues when you merge trunk:
./Components/ UbuntuShapeForI tem.qml: trailing whitespace Unity/categorie s.cpp: trailing whitespace
./runtests.sh: trailing whitespace
./plugins/
Components/ UbuntuShapeForI tem.qml actually has \r\n - should be converted to unix newlines.