mirror of
https://review.haiku-os.org/haiku
synced 2025-01-21 05:53:46 +01:00
6109a2086d
Conflicts: src/kits/interface/PicturePlayer.cpp src/servers/app/ServerPicture.cpp In addition, the following files were also adapted to master branch BPicture changes during the merge: src/kits/interface/PicturePlayer.h src/servers/app/PictureBoundingBoxPlayer.cpp