nitlanguage / nit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7895a8f eeaf8e6)
Resolve merge conflicts with master
authorAlexandre Terrasa <alexandre@moz-code.org>
Fri, 28 Feb 2014 18:22:37 +0000 (13:22 -0500)
committerAlexandre Terrasa <alexandre@moz-code.org>
Fri, 28 Feb 2014 18:22:37 +0000 (13:22 -0500)
commit8849a72b18f9fc6990f08d4a9759b8b1628dfee2
treeae84cf2e80dc69af9c4e04a3ab8db0921f98dc0atree | snapshot
parent7895a8fc2119cd00837bec23e7994d5eeeb44330commit | diff
parenteeaf8e639c0157ded481b59f468754c88ee999e9commit | diff
Resolve merge conflicts with master

Discard changes from commit eeaf8e639c0157ded481b59f468754c88ee999e9

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
src/nitdoc.nit diff1 | diff2 | blob | history
Nit language project; an oo programing language and its tool suite.