History | View | Annotate | Download (867 Bytes)
commit 797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6Merge: 693a2dc 568fb83Author: Nils Adermann <naderman@naderman.de>AuthorDate: Sat Mar 6 03:33:16 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Sat Mar 6 03:33:16 2010 +0100
Merge branch 'develop-olympus' into develop
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7aMerge: b68de23 ac32927Author: Nils Adermann <naderman@naderman.de>AuthorDate: Wed Mar 3 23:32:09 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into develop...
Copy 3.0.x branch to trunk
Hiding everywhere little buggers, eh?
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
unix format... will use this for the 2.0.x contrib dir.
An update from Jonathan
Fixed so that it won't touch files in the "images" directories.
Ran John's fix_files script to fix all the windows carriage returns.Also added the script in the develop dir. To use it copy it to the phpBB2 root dir and run it