Commit Graph

2 Commits

Author SHA1 Message Date
espie
0ffec1f241 mark explicit conflicts, unconfuse find-all-conflicts.
fix dependency from ltdl in mcrypt (noticed by mbalmer@)
2004-12-21 12:15:01 +00:00
robert
837cd0d4ce Import php-5.0.2;
PHP5 is a widely-used general-purpose scripting language 
that is especially suited for Web development and can be 
embedded into HTML.
2004-10-02 11:32:35 +00:00