On Sun, May 29, 2011 at 02:33:37PM -0700, elij wrote: > --- > .gitignore | 1 + > TRANSLATING | 2 +- > web/README | 4 ++-- > web/html/account.php | 4 ++-- > web/html/addvote.php | 2 +- > web/html/index.php | 4 ++-- > web/html/logout.php | 4 ++-- > web/html/packages.php | 8 ++++---- > web/html/passreset.php | 2 +- > web/html/pkgsubmit.php | 6 +++--- > web/html/rss.php | 2 +- > web/html/tu.php | 2 +- > web/html/voters.php | 4 ++-- > web/lib/{acctfuncs.inc => acctfuncs.inc.php} | 0 > web/lib/{aur.inc => aur.inc.php} | 8 ++++---- > web/lib/aurjson.class.php | 2 +- > web/lib/{config.inc.proto => config.inc.php.proto} | 0 > web/lib/{pkgfuncs.inc => pkgfuncs.inc.php} | 2 +- > web/lib/{stats.inc => stats.inc.php} | 2 +- > web/lib/{translator.inc => translator.inc.php} | 2 +- > web/lib/{version.inc => version.inc.php} | 0 > web/template/pkg_search_form.php | 2 +- > web/template/template.phps | 4 ++-- > 23 files changed, 34 insertions(+), 33 deletions(-) > rename web/lib/{acctfuncs.inc => acctfuncs.inc.php} (100%) > rename web/lib/{aur.inc => aur.inc.php} (99%) > rename web/lib/{config.inc.proto => config.inc.php.proto} (100%) > rename web/lib/{pkgfuncs.inc => pkgfuncs.inc.php} (99%) > rename web/lib/{stats.inc => stats.inc.php} (98%) > rename web/lib/{translator.inc => translator.inc.php} (97%) > rename web/lib/{version.inc => version.inc.php} (100%) >
Basically looks good. You should also amend the merge message for 1.9.0 in "UPGRADING" and add some additional note on renaming "web/lib/config.inc" to "web/lib/config.inc.php" *before* the merge message.