Merge branch 'master' into next
- master: WebSearch: get_fieldvalues_alephseq_like() utils git: addition of compile to gitignore
Conflicts:
modules/websearch/lib/search_engine.py
Signed-off-by: Tibor Simko <tibor.simko@cern.ch>
Description
Description
Details
Details
- Committed
Tibor Simko <tibor.simko@cern.ch> Sep 17 2013, 13:36 - Parents
- R3600:3625f1673a44: Merge branch 'maint-1.1'
R3600:bfb64176e809: WebSearch: disable webcoll part two - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 3625f1673a44 | Tibor Simko | Merge branch 'maint-1.1' | Sep 17 2013 | |||
| cc810c75b5dd | Tibor Simko | WebSearch: get_fieldvalues_alephseq_like() utils | Sep 17 2013 | |||
| 1bd0fa90b824 | Tibor Simko | Merge branch 'maint-1.0' into maint-1.1 | Sep 17 2013 | |||
| 1a3dc9cc0a5f | Tibor Simko | git: addition of compile to gitignore | Sep 17 2013 |