Merge branch 'alexis/libs/gtk'
authorJean Privat <jean@pryen.org>
Mon, 8 Apr 2013 12:30:47 +0000 (08:30 -0400)
committerJean Privat <jean@pryen.org>
Mon, 8 Apr 2013 12:30:47 +0000 (08:30 -0400)
commit7e44894eb766bf5d4d58c2a45356c6344410248f
tree4c5058fe34ba8f542f14469dc1c1d2a9184d9665
parentbc859a4f6a5aa860352225fbf9c281e8fc2efe8d
parente00a52971bf313e14d124e7ff6b34d3434f64204
Merge branch 'alexis/libs/gtk'

Conflicts:
tests/sav/nitstats_args1.sav
lib/standard/string.nit
tests/niti.skip
tests/sav/nitstats_args1.res
tests/tests.sh