Marc Delisle 82acbb2ba3 fix merge conflicts

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

..

google-javascript-compiler

…

compress-js

…

convertcfg.pl

…

create_tables.sql

…

create-release.sh

Change back to master after merging to STABLE/TESTING.

2010-08-20 13:56:28 +02:00

decode_bug.php

…

find_unused_messages.sh

…

generate-mo

…

lang-cleanup.sh

…

mergepo.py

…

php2gettext.sh

…

remove_control_m.sh

…

signon.php

…

update-po

…

upgrade_tables_mysql_4_1_2+.sql

…

upgrade.pl

…

upload-release

…