This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 3ad9533a3e217f5d6fcb4312b258d04bc16e7873 Merge: f1621cf bfbea3a Author: gregor herrmann <[email protected]> Date: Fri Dec 14 17:35:34 2012 +0100 Merge tag 'upstream/2.9+ds' into experimental Upstream version 2.9+ds Conflicts: build.number src/resource/build.properties --> removed .idea/.name | 1 - .idea/ant.xml | 15 - .idea/compiler.xml | 21 - .idea/copyright/profiles_settings.xml | 5 - .idea/encodings.xml | 5 - .idea/libraries/jersey.xml | 13 - .idea/libraries/lib.xml | 19 - .idea/libraries/oo.xml | 12 - .idea/libraries/plugin.xml | 14 - .idea/libraries/sciplore.xml | 10 - .idea/misc.xml | 30 - .idea/modules.xml | 9 - .idea/scopes/scope_settings.xml | 5 - .idea/uiDesigner.xml | 125 ---- .idea/vcs.xml | 8 - .idea/workspace.xml | 779 --------------------- JabRef - MrDlib.userlibraries | 25 + Jabref.eml | 51 ++ build.gradle | 88 +++ build.xml | 2 +- buildlib/jalopy-1.0b10.jar | Bin 0 -> 905948 bytes buildlib/jalopy-ant-0.6.1.jar | Bin 0 -> 12807 bytes buildlib/junit.jar | Bin 0 -> 121070 bytes buildlib/licenses.txt | 20 + combineJournalLists.py | 31 + deploy | 16 + src/Jabref.iml | 19 - src/help/LabelPatterns.html | 7 +- src/help/SearchHelp.html | 25 +- src/help/fr/ACMPortalHelp.html | 2 +- src/help/fr/CiteSeerHelp.html | 2 +- src/help/fr/Contents.html | 24 +- src/help/fr/DiVAtoBibTeXHelp.html | 26 + src/help/fr/LabelPatterns.html | 7 +- src/help/fr/RevisionHistory.html | 31 + src/help/fr/SearchHelp.html | 35 +- src/help/fr/SpecialFieldsHelp.html | 58 +- src/images/reference_list.xcf | Bin 553160 -> 0 bytes src/images/splash.png | Bin 175534 -> 173073 bytes src/java/net/sf/jabref/TableColumnsTab.java | 3 +- src/java/net/sf/jabref/gui/CleanUpAction.java | 77 +- .../net/sf/jabref/imports/ACMPortalFetcher.java | 75 +- src/java/net/sf/jabref/imports/CaseKeeper.java | 15 +- src/java/net/sf/jabref/imports/CaseKeeperList.java | 319 ++++++++- .../net/sf/jabref/imports/DOItoBibTeXFetcher.java | 26 +- .../sf/jabref/imports/GoogleScholarFetcher.java | 12 + src/java/net/sf/jabref/imports/HTMLConverter.java | 329 ++++++--- .../net/sf/jabref/imports/IEEEXploreFetcher.java | 25 +- .../imports/fetcher/ISBNtoBibTeXFetcher.java | 22 +- .../net/sf/jabref/oo/AlphanumericComparator.java | 28 +- .../jabref/wizard/auximport/AuxSubGenerator.java | 18 +- src/resource/JabRef_da.properties | 8 + src/resource/JabRef_de.properties | 8 + src/resource/JabRef_en.properties | 8 + src/resource/JabRef_fr.properties | 10 +- src/resource/JabRef_in.properties | 8 + src/resource/JabRef_it.properties | 10 +- src/resource/JabRef_ja.properties | 8 + src/resource/JabRef_nl.properties | 8 + src/resource/JabRef_no.properties | 8 + src/resource/JabRef_pt_BR.properties | 9 +- src/resource/JabRef_tr.properties | 30 +- src/resource/JabRef_vi.properties | 8 + src/resource/JabRef_zh.properties | 8 + src/resource/Menu_de.properties | 4 +- src/resource/project.ppf | 52 -- src/txt/CHANGELOG | 9 + src/txt/README | 4 +- syncLang.py | 374 ++++++++++ 69 files changed, 1636 insertions(+), 1427 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
