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-04-10 15:05:14 +02:00
2011-12-01 20:45:50 -07:00
2014-02-07 14:42:51 +01:00
2015-07-30 19:50:03 +02:00
2012-01-22 15:30:15 +13:00
2013-07-03 23:41:44 -04:00
2014-06-13 17:27:01 -04:00
2011-12-01 22:47:46 -07:00
2014-06-13 17:27:01 -04:00
2013-07-08 19:29:11 -04:00
2014-06-13 17:27:01 -04:00
2014-06-13 17:27:01 -04:00
2014-06-13 17:27:01 -04:00
2014-10-01 12:12:16 +02:00
2014-10-11 11:18:56 +02:00
2015-01-23 21:00:28 +01:00
2014-09-02 10:16:01 +02:00
2013-07-08 19:29:11 -04:00
2015-04-10 15:05:14 +02:00
2013-07-08 19:29:11 -04:00
2013-07-08 19:29:11 -04:00
2015-09-04 17:32:44 +02:00
2011-12-01 20:45:50 -07:00
2015-01-23 21:00:26 +01:00
2015-04-15 00:34:05 +02:00
2014-04-08 14:10:10 -04:00
2014-06-13 17:27:01 -04:00
2015-02-20 14:38:43 -05:00
2015-09-09 20:58:57 +02:00
2014-06-13 17:27:01 -04:00
2014-02-28 19:05:34 -05:00
2014-11-27 09:00:23 +01:00
2014-06-13 17:27:01 -04:00
2014-05-19 20:13:38 -04:00
2014-06-13 17:27:01 -04:00
2015-09-05 16:09:33 +02:00
2014-05-21 16:12:47 -04:00
2013-11-11 19:27:45 -05:00
2014-06-13 17:27:01 -04:00
2014-05-30 19:31:10 -04:00
2014-06-19 19:23:31 +02:00
2014-06-13 17:27:01 -04:00
2015-09-15 00:39:23 +00:00
2014-03-04 14:28:20 -05:00
2013-07-08 19:29:11 -04:00
2014-07-14 19:15:13 -04:00
2013-12-22 02:48:27 +01:00
2011-12-01 22:47:46 -07:00
2013-07-08 19:29:11 -04:00
2013-07-08 19:29:11 -04:00
2015-01-23 21:00:28 +01:00
2015-07-14 11:22:44 -04:00
2015-03-27 13:24:09 +01:00
2014-07-24 13:55:09 -04:00
2013-07-08 19:29:11 -04:00
2015-07-25 16:35:52 +02:00
2015-09-14 20:45:38 +02:00