Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 17 2012, 10:52.

Description

Merge branch 'maint-1.0'

  • maint-1.0: plotextractor: fix INSPIRE unit test installation: new 'make install-ckeditor-plugin' installation: fix 'install-mathjax-plugin' installation: fix 'make install-jquery-plugins'

Conflicts:
Makefile.am
modules/miscutil/lib/plotextractor_tests.py

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:d38dd00e6256: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 17 2012, 10:52

Merged Changes

CommitAuthorDetailsCommitted
60bc1f17f3a9Tibor Simko
plotextractor: fix INSPIRE unit test 
Feb 17 2012
937710605949Tibor Simko
installation: new 'make install-ckeditor-plugin' 
Feb 17 2012
570710e675bdTibor Simko
installation: fix 'install-mathjax-plugin' 
Feb 17 2012
96791bc9d5d0Tibor Simko
installation: fix 'make install-jquery-plugins' 
Feb 17 2012