ToastFreeware / debian / jabref.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fa3ef3 ca8bcc0)
Merge tag 'upstream/2.9_beta1+ds' into experimental
authorgregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 17:49:59 +0000 (18:49 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 17:49:59 +0000 (18:49 +0100)
Upstream version 2.9~beta1+ds

Conflicts:
build.number
src/resource/build.properties

(removed)


Trivial merge
Debian package jabref