Ignored revisions: 12346
included in: 224267
changeset:   15069:d32171ae1288
tag:         tip
parent:      15068:9ad17c25c1bf
parent:      15067:a546c64a6b3c
user:        Oz Linden 
date:        Thu Mar 17 10:18:03 2011 -0400
summary:     Automated merge with file:///Users/oz/Work/V-PB

codeticket:  224243
included in: 224267
changeset:   15067:a546c64a6b3c
parent:      15066:c9fe42c70162
parent:      15065:f024f60502fb
user:        Oz Linden 
date:        Wed Mar 16 21:24:21 2011 -0400
summary:     merge changes for storm-1064

included in: 224243
changeset:   15065:f024f60502fb
parent:      15064:d6c4b783dbc6
parent:      15063:4cb27d7e8e36
user:        Oz Linden 
date:        Wed Mar 16 21:22:45 2011 -0400
summary:     merge changes for storm-357

Found Known Changeset:
codeticket:  224019
codeticket:  223988
included in: 224243
changeset:   15063:4cb27d7e8e36
user:        Oz Linden 
date:        Tue Mar 15 16:14:07 2011 -0400
summary:     increment viewer version to 2.6.1

included in: 224243
changeset:   15064:d6c4b783dbc6
parent:      14833:aed94e854443
user:        Paul ProductEngine 
date:        Thu Mar 10 14:21:35 2011 +0200
summary:     STORM-357 FIXED Gestures button is in the pressed state after drag-n-drop but gestures list isn't visible.

Found Known Changeset:
codeticket:  223245
codeticket:  223244
included in: 224243
changeset:   14833:aed94e854443
parent:      14826:73f42030a5c5
parent:      14832:bae554c60420
user:        Merov Linden 
date:        Wed Mar 09 11:56:34 2011 -0800
summary:     Crash hunters: pull in viewer-development

included in: 224243
changeset:   15066:c9fe42c70162
parent:      14833:aed94e854443
user:        Jonathan Yap
date:        Thu Mar 10 06:44:03 2011 -0500
summary:     STORM-1064 People sidebar panel elements have inconsistent widths and map is slightly too tall

Found Known Changeset:
codeticket:  223245
codeticket:  223244
included in: 224243
changeset:   14833:aed94e854443
parent:      14826:73f42030a5c5
parent:      14832:bae554c60420
user:        Merov Linden 
date:        Wed Mar 09 11:56:34 2011 -0800
summary:     Crash hunters: pull in viewer-development

codeticket:  224080
codeticket:  224045
codeticket:  224006
included in: 224267
changeset:   15068:9ad17c25c1bf
parent:      15061:4e9eec6a347f
user:        Dessie Linden 
date:        Tue Mar 15 13:25:38 2011 -0700
summary:     Added viewer-pre-beta parameters to BuildParams

included in: 224080
included in: 224045
included in: 224006
changeset:   15061:4e9eec6a347f
tag:         2.6.0-start
user:        Oz Linden 
date:        Tue Mar 15 15:50:52 2011 -0400
summary:     Added tag 2.6.0-start for changeset f1827b441e05

Found Known Changeset:
codeticket:  223960
included in: 224080
included in: 224045
included in: 224006
changeset:   15060:f1827b441e05
parent:      15059:ed62e8e11283
parent:      15058:3d01f60f07fe
user:        Oz Linden 
date:        Tue Mar 15 13:52:09 2011 -0400
summary:     merge build fixes from viewer-social