ninadsp a2f78a6d38 Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

..

google-javascript-compiler

…

compress-js

…

convertcfg.pl

remove author names

2010-06-28 20:36:12 +02:00

create_tables.sql

Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30

create-release.sh

…

decode_bug.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

find_unused_messages.sh

…

generate-mo

…

lang-cleanup.sh

…

mergepo.py

…

php2gettext.sh

…

remove_control_m.sh

…

signon.php

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

update-po

…

upgrade_tables_mysql_4_1_2+.sql

Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30

upgrade.pl

…

upload-release

…