--- - branch: MAIN date: Fri Mar 19 21:34:44 UTC 2010 files: - new: '1.2' old: 1.1.1.1 path: pkgsrc/www/gallery/Makefile pathrev: pkgsrc/www/gallery/Makefile@1.2 type: modified id: 20100319T213444Z.b105bbc9ee706c097e91ee096bee211f7a8c1f50 log: | Replace CONFLICT pattern that can't work with proper dependency on PHP 5.3. Bump revision. module: pkgsrc subject: 'CVS commit: pkgsrc/www/gallery' unixtime: '1269034484' user: joerg