nitlanguage / nit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b47949a 9902c7a)
Merge master to solve conflicts
authorJean Privat <jean@pryen.org>
Sat, 13 Jun 2015 11:20:21 +0000 (07:20 -0400)
committerJean Privat <jean@pryen.org>
Sat, 13 Jun 2015 11:20:21 +0000 (07:20 -0400)

Trivial merge
Nit language project; an oo programing language and its tool suite.