[cmake-developers] Merging "CrossCompilingFix13796" and "AddIARToolchain2" into next
neundorf at kde.org
Sun Apr 14 15:43:17 EDT 2013
on cmake stage I have currently the two branches CrossCompilingFix13796 and
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:
Merge: d6140a3 edd90f9
Author: Alex Neundorf <neundorf at kde.org>
Date: Sat Apr 13 19:32:58 2013 +0200
Merge branch 'master' of git://cmake.org/cmake
...repeated 3 times
Author: Peter KÃ¼mmel <syntheticpp at gmx.net>
Date: Sat Mar 9 12:04:16 2013 +0100
Ninja: escape line breaks in literals
, 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.
More information about the cmake-developers