~wolfy1339/corsixth/+git/master:beta2

Last commit made on 2010-03-24
Get this branch:
git clone -b beta2 https://git.launchpad.net/~wolfy1339/corsixth/+git/master

Branch merges

Branch information

Name:
beta2
Repository:
lp:~wolfy1339/corsixth/+git/master

Recent commits

15bcc32... by Peter Cawley <email address hidden>

Apply r595 to release branch.

4f7b198... by Manuel Wolf <email address hidden>

Merge r593 into beta2 branch.

d4c3aea... by Edvin Linge <email address hidden>

Applied Revision 591 to the beta 2 branch.

c8c29ad... by Peter Cawley <email address hidden>

Apply r588 to beta2 branch.

77e39c9... by Peter Cawley <email address hidden>

Apply r586 to beta2 branch.

60b7e77... by Peter Cawley <email address hidden>

Fixed a bug which prevented saving:
 An extra argument was being passed to _S's __call handler, which has hence passed on to string.format, and was then saved to a string proxy's reconstruct info.
 This extra argument was the weak table which stores the mapping from string proxies to proxied values, thus causing subtle chaos.
Fixed a bug which prevented proper diagnostics when saving failed:
 String proxy __tostring threw an error when the proxied object was a table.
 This caused persistance.lua's NameOf() function to cause an error, thus suppressing the original error from persist.dump

14d227b... by Peter Cawley <email address hidden>

Taking a branch for beta2

62fc1ba... by Peter Cawley <email address hidden>

Added a readme text file for people who do not find the wiki.

aabb8ed... by Erlend Mongstad <email address hidden>

Update: Hope this will get into the beta2:)

b5e993a... by Peter Cawley <email address hidden>

Fix infinite loop which could occur on staff management screen if there were no staff in a particular category.