Changeset 593 for branches/stable/templates/search

Timestamp:

05/14/13 18:10:22 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates (copied) (copied from trunk/templates )
• templates/search (copied) (copied from trunk/templates/search )
• templates/search/compsearch.tmpl (copied) (copied from trunk/templates/search/compsearch.tmpl )
• templates/search/sresults.tmpl (copied) (copied from trunk/templates/search/sresults.tmpl )