Ignored revisions: 12346 Ignoring 4103 ancestors included in old builds. included in: 220567 changeset: 16457:6d01a526863a tag: tip parent: 16449:99040b1a333f parent: 16456:b0bceb572090 user: Loren Shih date: Tue Feb 08 12:46:43 2011 -0500 summary: Automated merge up from viewer-development into mesh-development codeticket: 220434 included in: 220567 changeset: 16456:b0bceb572090 user: Merov Linden date: Fri Feb 04 16:38:26 2011 -0800 summary: STORM-610 : Backing out that change (test fail) included in: 220434 changeset: 16455:fc1341c85efe user: Merov Linden date: Fri Feb 04 15:38:15 2011 -0800 summary: Clean up license headers in a handfull of files included in: 220434 changeset: 16454:1eca87abef88 parent: 16452:4b231fb481e8 parent: 16453:78514d4a7df8 user: Merov Linden date: Fri Feb 04 15:26:14 2011 -0800 summary: STORM-655 : Pull into viewer-development included in: 220434 changeset: 16453:78514d4a7df8 parent: 16397:33fc9ed99d29 user: paul_productengine date: Tue Feb 01 18:39:24 2011 +0200 summary: STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg) included in: 220434 changeset: 16452:4b231fb481e8 parent: 16450:015e627da874 parent: 16451:e82c7bc95fba user: Merov Linden date: Fri Feb 04 15:25:10 2011 -0800 summary: STORM-610 : Pull into viewer-development included in: 220434 changeset: 16451:e82c7bc95fba parent: 16344:b542f8134a2b user: Vadim ProductEngine date: Fri Jan 28 16:04:32 2011 +0200 summary: STORM-610 FIXED Changes to water color and density in the Environment Editor now persist between sessions. included in: 220434 changeset: 16450:015e627da874 parent: 16443:2fe9d48e5881 user: Vadim ProductEngine date: Fri Feb 04 16:41:52 2011 +0200 summary: STORM-465 FIXED Made all keys localizable. codeticket: 220527 included in: 220567 changeset: 16449:99040b1a333f user: Nyx (Neal Orman) date: Mon Feb 07 21:03:10 2011 -0500 summary: SH-930 FIX revert ARC algorithm for merge to viewer-development