Homec4science

Merge branch 'maint-1.1'

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 4 2013, 18:03.

Description

Merge branch 'maint-1.1'

  • maint-1.1: BibDocFile: support new magic library

Conflicts:
modules/bibdocfile/lib/bibdocfile.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:c56e3ebd4f41: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 4 2013, 18:03

Merged Changes

CommitAuthorDetailsCommitted
8abd2ae67634Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Feb 4 2013
c0b2dcd46d09Samuele Kaplun/Tibor Simko
BibDocFile: support new magic library 
Feb 4 2013

Empty Commit

This commit is empty and does not affect any paths.