[jflex] 02/33: set mergeWithUpstream=1

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jflex.

commit 880906a6d1eea8ba0d0fc281c66419532415b10c
Author: Charles Fry <cfry at debian.org>
Date:   Mon Jan 9 18:44:54 2006 +0000

    set mergeWithUpstream=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jflex.git