summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.h
AgeCommit message (Expand)Author
2009-10-05Fix viewer-2 build due to duplicate lines in a header merge.James Cook
2009-10-05merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-10-01merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
2009-09-29merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-11merge -r 1649-1651 https://svn.aws.productengine.com/secondlife/pe/stable-2@1...Steven Bennetts
2009-09-07merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-07-02merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts