Merge branch 'maint-1.0'
- maint-1.0: installation: fix jQuery uploadify download URL installation: remove unneeded rxp binary package
Conflicts:
INSTALL
Makefile.am
Tibor Simko <tibor.simko@cern.ch> | May 1 2012, 02:47 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
df15fe5342c8 | Tibor Simko | installation: fix jQuery uploadify download URL | May 1 2012 | |||
a858b97724a2 | Samuele Kaplun/Tibor Simko | installation: remove unneeded rxp binary package | Apr 18 2012 |