completed: Thu Dec 30 22:14:01 2010
. [ default ] . changeset: 14357:b0bd26c5638a . tag: tip . parent: 14356:40e4b7541f5a . parent: 14355:27dae7b01a81 . user: Loren Shih <seraph@lindenlab.com> . date: Thu Dec 30 13:11:44 2010 -0500 . summary: Automated merge from viewer-development . changeset: 14356:40e4b7541f5a . parent: 14347:43cf4a37774c . user: Loren Shih <seraph@lindenlab.com> . date: Wed Dec 29 15:19:43 2010 -0500 . summary: SH-702 Broken Window: rename shader_heirarchy.txt to shader_hierarchy.txt