Julian Harnath 6109a2086d Merge branch 'app_server'
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
2015-11-10 23:09:54 +01:00
..
2015-01-23 21:00:28 +01:00
2015-09-09 20:58:57 +02:00
2015-09-05 16:09:33 +02:00
2015-07-14 11:22:44 -04:00
2015-07-25 16:35:52 +02:00