Hi, 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.
My master differs from origin/master: $ git checkout master Already on 'master' Your branch is ahead of 'origin/master' by 4 commits. "git log origin/master.." shows me the difference: commit cb8c6a0936f23d2679669fc10a2313594ee9a3fe Merge: d6140a3 edd90f9 Author: Alex Neundorf <[email protected]> Date: Sat Apr 13 19:32:58 2013 +0200 Merge branch 'master' of git://cmake.org/cmake ...repeated 3 times commit be3a07c57a9dada97b8032869d1844c1b99dd8a4 Author: Peter Kümmel <[email protected]> Date: Sat Mar 9 12:04:16 2013 +0100 Ninja: escape line breaks in literals BUG: 13591 , but I don't know whether that problem was before or after I branched away those two branches mentioned above. git log on both branches doesn't show anything suspicious (at least to me). It would be nice if you could have a look whether they are ok, I'd feel better with merging then. Thanks Alex -- 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
