Diffusion invenio-infoscience 52d7de7d101f

Merge branch 'maint-1.0'
52d7de7d101f
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 7 2012, 20:05.

Description

Merge branch 'maint-1.0'

maint-1.0: BibConvert: inactivate admin guide parts test case WebSearch: inactivate (U(1) OR SL(2,Z)) test case BibEdit: regression test case fix

Conflicts:
modules/bibconvert/lib/bibconvert_regression_tests.py
modules/bibedit/lib/bibedit_regression_tests.py
modules/websearch/lib/websearch_regression_tests.py

Details

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 7 2012, 20:05

Parents

R3600:99ea0217cc3b: Merge branch 'maint-1.0'
R3600:f769c7eb012b: BibConvert: inactivate admin guide parts test case

Branches

Unknown

Tags

Unknown

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:52d7de7d101f: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 7 2012, 20:05

Merged Changes

Commit	Author	Details	Committed
f769c7eb012b	Tibor Simko	BibConvert: inactivate admin guide parts test case	Aug 7 2012
e176f84044de	Tibor Simko	WebSearch: inactivate (U(1) OR SL(2,Z)) test case	Aug 7 2012
77c58d987804	Tibor Simko	BibEdit: regression test case fix	Aug 7 2012

Changes (3)

				Path
	M			modules/bibconvert/lib/bibconvert_regression_tests.py
	M			modules/bibedit/lib/bibedit_regression_tests.py
	M			modules/websearch/lib/websearch_regression_tests.py