| /haiku/src/tests/servers/app/unit_tests/ |
| H A D | SimpleTransformTest.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | SimpleTransformTest.cpp | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | AppServerUnitTestAddOn.cpp | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | Jamfile | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| /haiku/src/servers/app/drawing/Painter/drawing_modes/ |
| H A D | DrawingModeAlphaPCSolid.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawingModeAlphaPOSUBPIX.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawingModeAlphaPOSolid.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawingModeAlphaPOSolidSUBPIX.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawingModeAlphaPO.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawingModeAlphaPC.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| /haiku/src/servers/app/ |
| H A D | SimpleTransform.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | PictureBoundingBoxPlayer.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | TestServerLoopAdapter.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | test_app_server.rdef | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | TestServerLoopAdapter.cpp | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| /haiku/src/tests/servers/registrar/ |
| H A D | test_registrar.rdef | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| /haiku/src/servers/app/drawing/Painter/ |
| H A D | agg_clipped_alpha_mask.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | PainterAggInterface.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| /haiku/src/servers/app/drawing/Painter/bitmap_painter/ |
| H A D | painter_bilinear_scale.nasm | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | BitmapPainter.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawBitmapGeneric.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawBitmapNearestNeighbor.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawBitmapNoScale.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | BitmapPainter.cpp | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|
| H A D | DrawBitmapBilinear.h | 6109a2086d1110934dc7ff48e381b41c9ea5120e Tue Nov 10 22:09:54 UTC 2015 Julian Harnath <julian.harnath@rwth-aachen.de> 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
|