Homec4science

Merge branch 'maint-1.0'

Authored by Tibor Simko <tibor.simko@cern.ch> on May 1 2012, 02:47.

Description

Merge branch 'maint-1.0'

  • maint-1.0: installation: fix jQuery uploadify download URL installation: remove unneeded rxp binary package

Conflicts:
INSTALL
Makefile.am

Event Timeline

Tibor Simko <tibor.simko@cern.ch> committed R3600:83b884026a90: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).May 1 2012, 02:47

Merged Changes

CommitAuthorDetailsCommitted
df15fe5342c8Tibor Simko
installation: fix jQuery uploadify download URL 
May 1 2012
a858b97724a2Samuele Kaplun/Tibor Simko
installation: remove unneeded rxp binary package 
Apr 18 2012