You know what folks, a lot of Mercurial merges failed, and I just now figured out why. So now all changes from stable are permanently synced in.
.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {
border: 1px dotted #cc0000;
background-position: center;
background-repeat: no-repeat;
background-color: #ffffcc;
}
.mceItemShockWave {
background-image: url('../images/shockwave.gif');
}
.mceItemFlash {
background-image: url('../images/flash.gif');
}
.mceItemQuickTime {
background-image: url('../images/quicktime.gif');
}
.mceItemWindowsMedia {
background-image: url('../images/windowsmedia.gif');
}
.mceItemRealMedia {
background-image: url('../images/realmedia.gif');
}