This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 43a2487936d5b5953d1a2b4826106344151c6bb9 Merge: 35564cf 91cec18 Author: gregor herrmann <[email protected]> Date: Mon Dec 17 20:05:17 2012 +0100 Merge tag 'upstream/2.9r+ds' into experimental Upstream version 2.9r+ds Conflicts: build.number --> removed src/help/About.html | 3 - src/help/RevisionHistory.html | 11 + src/help/da/About.html | 3 - src/help/de/About.html | 5 +- src/help/fr/About.html | 3 - src/help/in/About.html | 3 - src/help/ja/About.html | 3 - src/help/ja/GroupsHelp.html | 285 ++++-------- src/help/ja/jabref_help.css | 3 +- src/java/net/sf/jabref/gui/CleanUpAction.java | 2 +- src/java/net/sf/jabref/imports/CaseKeeper.java | 4 +- src/java/net/sf/jabref/imports/HTMLConverter.java | 120 ++++- src/resource/JabRef_ja.properties | 542 +++++++++++----------- src/resource/Menu_ja.properties | 28 +- src/txt/CHANGELOG | 2 +- 15 files changed, 494 insertions(+), 523 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
