Marc Delisle 82acbb2ba3 fix merge conflicts

2010-08-21 07:46:57 -04:00

..

codegen.php

…

csv.php

Fix typo.

2010-08-19 11:47:39 +02:00

excel.php

…

htmlword.php

…

json.php

Fixes for JSON plugin.

2010-08-19 14:05:04 +02:00

latex.php

…

mediawiki.php

…

ods.php

…

odt.php

…

pdf.php

Merge remote branch 'lori/gsoc'

2010-08-19 11:11:51 +02:00

php_array.php

…

sql.php

account for changes introduced when merging lori/gsoc branch

2010-08-19 16:36:41 +02:00

texytext.php

…

xls.php

…

xlsx.php

…

xml.php

…

yaml.php

…