Alexander Neundorf wrote: > On Thursday 14 March 2013, Robert Maynard wrote: >> These changes will be in 2.8.11 RC1 for you to test out. > > Cool :-) > Before I merge it into next, could you have a look at the TI_DSP_to_TI > branch, I had some git trouble and I'm not quite sure everything is in > this branch as it should...
You have a copy of a commit from Peter in your branch which shouldn't be there. Run 'git rebase origin/master' and check the result with gitk before merging. Thanks, Steve. -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://www.cmake.org/mailman/listinfo/cmake
