Merge branch 'alexandre/nitdoc-quicksearch'
authorJean Privat <jean@pryen.org>
Tue, 17 Apr 2012 17:00:24 +0000 (13:00 -0400)
committerJean Privat <jean@pryen.org>
Tue, 17 Apr 2012 17:00:24 +0000 (13:00 -0400)
commit2228e00a445aeb832044184674fd9d159afa8821
tree40978dd51636fa93876881e03759242ae338bd0d
parent910ca9a7004c80017e0e2742899d3e17f4e2aea0
parentffcb50f8c2b06544adf7d601c9fdad391eafbdfb
Merge branch 'alexandre/nitdoc-quicksearch'

Conflicts:
tests/sav/nitdoc_args1.sav
src/nitdoc.nit
tests/sav/nitdoc_args1.sav