On 04/14/2013 03:43 PM, Alexander Neundorf wrote: > on cmake stage I have currently the two branches CrossCompilingFix13796 and > AddIARToolchain2. > AddIARToolchain2 is intended to 2.8.12, CrossCompilingFix13796 could also > still go into 2.8.11 if there is time left. > I had some git issues here (something went wrong with git rebase -i), I'm not > sure those two branches are in a good state, and don't want to merge them to > next before I'm sure about that.
I've merged the two branches after revising some text in them. They seem to have been based on origin/maser so there was no trouble from your local master situation. > My master differs from origin/master: > $ git checkout master > Already on 'master' > Your branch is ahead of 'origin/master' by 4 commits. Just run git checkout master git reset --hard origin/master to get back in sync with upstream master. -Brad -- 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://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
