OSDN Git Service

MERGE: revision 1685 and 1690 from original repository
authorsakamocchi <o-takashi@sakamocchi.jp>
Sat, 10 Mar 2012 11:32:12 +0000 (20:32 +0900)
committersakamocchi <o-takashi@sakamocchi.jp>
Sat, 10 Mar 2012 11:32:12 +0000 (20:32 +0900)
commit9ccaf7bb039d035062ffd8a6ceacdb16745b0f08
tree867c22e49048339665180a05605cbf8af53ec1ad
parentb2f8b4c1642422046684955aae6e7d26630491bd
MERGE: revision 1685 and 1690 from original repository

Revision 1685:FIX: some easy bugs.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1685

Revision 1690: Work in upgrades folder to prepare for 4.0. I realize
it is being reworked, but wanted to keep this current version
up-to-date.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1690
nucleus/upgrades/index.php
nucleus/upgrades/upgrade.functions.php
nucleus/upgrades/upgrade.php
nucleus/upgrades/upgrade2.5.php
nucleus/upgrades/upgrade4.0.php