965679 - [Holly] Snow Leopard has the Australis Toolbar.png due to a bad merge/backout

Status: RESOLVED FIXED

(Firefox :: Theme, defect)

Description

[Matthew N. [:MattN]]

Last good revision: 45677214a968 (2014-01-22)
First bad revision: bf66280f5f37 (2014-01-23)
Pushlog:
http://hg.mozilla.org/projects/holly/pushloghtml?fromchange=45677214a968&tochange=bf66280f5f37
Push: https://tbpl.mozilla.org/?tree=Holly&rev=bf66280f5f37

The osx/Toolbar.png change in bug 888601 made it to Holly but shouldn't have. Lion and higher are fine since Toolbar-Lion.png is still used on Holly. I tried to verify that this was the only image in browser/themes which wasn't reverted properly for Holly but I'm not 100% sure that I did it properly because of the many merges and many tools aren't good at handling binary files.

Marking as P1 so Holly is ready in case we decide to use it.

Comment 1

[Matthew N. [:MattN]]

Attachment: Revert osx/Toolbar.png

Comment 2

[Matthew N. [:MattN]]

Thanks

https://hg.mozilla.org/projects/holly/rev/142412c09b7d

Comment 3

[:Gijs (he/him)]

Ugh. Thanks for noticing this. Still not sure how this didn't show up as a conflict when merging. :-\