Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on Jun 21 2012, 11:01.

Description

Merge branch 'maint-1.0'

  • maint-1.0: BibSword: remove dangling documentation WebSearch: CERN FP collection hack update

Conflicts:
modules/bibsword/doc/hacking/bibedit-internals.webdoc

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:d551d48ab150: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Jun 21 2012, 11:01

Merged Changes

CommitAuthorDetailsCommitted
edc4d575b461Samuele Kaplun/Tibor Simko
BibSword: remove dangling documentation 
Jun 20 2012
a41b2c827e10Ludmila Marian/Tibor Simko
WebSearch: CERN FP collection hack update 
Jun 20 2012