Unity 8

Code review comment for lp:~macslow/unity8/shellRotation

  1. shellRotation
  2. Merge into trunk
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
Text conflict in src/ApplicationArguments.h
Conflict adding file src/UnityCommandLineParser.cpp. Moved existing file to src/UnityCommandLineParser.cpp.moved.
Conflict adding file src/UnityCommandLineParser.h. Moved existing file to src/UnityCommandLineParser.h.moved.
Text conflict in src/main.cpp
Text conflict in tests/plugins/Unity/Launcher/CMakeLists.txt
6 conflicts encountered.

« Back to merge proposal