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
Tibor Simko <tibor.simko@cern.ch> | Jun 21 2012, 11:01 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
edc4d575b461 | Samuele Kaplun/Tibor Simko | BibSword: remove dangling documentation | Jun 20 2012 | |||
a41b2c827e10 | Ludmila Marian/Tibor Simko | WebSearch: CERN FP collection hack update | Jun 20 2012 |