Lot's of conflicts with trunk:
""" Text conflict in src/ubuntumirclient/integration.cpp Text conflict in src/ubuntumirclient/integration.h Text conflict in src/ubuntumirclient/window.cpp Text conflict in src/ubuntumirclient/window.h 4 conflicts encountered. """
« Back to merge proposal
Lot's of conflicts with trunk:
""" ient/integratio n.cpp ient/integratio n.h ient/window. cpp ient/window. h
Text conflict in src/ubuntumircl
Text conflict in src/ubuntumircl
Text conflict in src/ubuntumircl
Text conflict in src/ubuntumircl
4 conflicts encountered.
"""