Ignored revisions: 12346
included in: 222387
changeset:   16604:4e0e64f8f16b
tag:         tip
parent:      16603:068038b860d0
parent:      16602:5f8b97cfa0d7
user:        leyla_linden
date:        Tue Mar 01 14:32:49 2011 -0800
summary:     Merge

Found Known Changeset:
codeticket:  222384
included in: 222387
changeset:   16602:5f8b97cfa0d7
user:        Dave Parks 
date:        Tue Mar 01 16:04:25 2011 -0600
summary:     SH-1068 Disable DoF when underwater (shader doesn't have enough information to execute).

included in: 222387
changeset:   16603:068038b860d0
parent:      16600:c47054739e2b
user:        leyla_linden
date:        Tue Mar 01 14:29:46 2011 -0800
summary:     SH-311 Physics Shape Type UI collides with torus parameters

Found Known Changeset:
codeticket:  222169
included in: 222387
changeset:   16600:c47054739e2b
parent:      16599:f614654cfb8b
parent:      16598:ef904e84472f
user:        prep linden 
date:        Mon Feb 28 13:11:02 2011 -0500
summary:     merge