summaryrefslogtreecommitdiff
path: root/slideshow
AgeCommit message (Collapse)AuthorFilesLines
2009-04-27CWS-TOOLING: integrate CWS sb107Ivo Hinkelmann1-1/+0
2009-04-14 13:09:13 +0200 sb r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46) 2009-04-06 14:11:54 +0200 sb r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein 2009-03-31 16:40:23 +0200 sb r270287 : decrease collisions in hashCode computation 2009-03-30 11:48:39 +0200 sb r270207 : #i100668# corrected explicit template instantiation 2009-03-26 14:16:26 +0100 sb r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789 2009-03-26 10:52:51 +0100 sb r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057 2009-03-26 10:46:36 +0100 sb r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value. 2009-03-25 16:53:39 +0100 sb r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini 2009-03-25 15:29:12 +0100 sb r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets) 2009-03-25 15:17:10 +0100 sb r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6 2009-03-25 14:15:23 +0100 sb r270023 : added svn:ignore 2009-03-25 10:25:08 +0100 sb r270002 : #i10000# copied over trunk -c 269820 2009-03-23 10:16:00 +0100 sb r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44) 2009-03-20 11:22:27 +0100 sb r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists 2009-03-20 09:21:32 +0100 sb r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems). 2009-03-19 11:34:56 +0100 sb r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive 2009-03-19 11:32:20 +0100 sb r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type 2009-03-12 10:39:08 +0100 sb r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831 2009-03-04 17:25:16 +0100 sb r268849 : #i99880# missing AUGMENT_LIBRARY_PATH 2009-02-25 17:54:34 +0100 sb r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42) 2009-02-25 09:23:15 +0100 sb r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc) 2009-02-23 10:02:25 +0100 sb r268344 : #i99519 removed unnecessary library dependencies 2009-02-18 17:54:24 +0100 sb r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds) 2009-02-18 17:50:34 +0100 sb r268249 : avoid erroneous warning that control reaches end of non-void function 2009-02-18 17:33:53 +0100 sb r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>
2009-03-05CWS-TOOLING: integrate CWS cmcfixes54Oliver Bolte1-0/+2
2009-02-19 17:39:12 +0100 cmc r268301 : revert meant-to-be local-only changes in configure 2009-02-19 17:33:52 +0100 cmc r268300 : revert meant-to-be local-only change in readlicense_oo 2009-02-19 17:31:48 +0100 cmc r268299 : remove config_office dir from workspace, hopefully this doesn't screw things up 2009-02-05 17:38:47 +0100 cmc r267431 : #i98367# snprintf needs stdio.h on gcc4.4 2009-01-27 10:51:54 +0100 cmc r266964 : CWS-TOOLING: rebase CWS cmcfixes54 to trunk@266944 (milestone: DEV300:m40) 2009-01-23 10:05:33 +0100 cmc r266774 : #i98389# fix t602 filter warnings 2009-01-22 16:37:57 +0100 cmc r266740 : #i98367# revert limits.h as its going in elsewhere 2009-01-22 16:36:45 +0100 cmc r266739 : #i98367# remove easy warnings 2009-01-22 16:31:49 +0100 cmc r266738 : #i98366# merge in basic fix of #i96087# to bf_basic 2009-01-22 14:50:24 +0100 cmc r266716 : #i98288# some versions of neon report DAV:Collection instead of Collection
2009-02-27CWS-TOOLING: integrate CWS impress162Oliver Bolte7-31/+131
2009-02-19 13:02:17 +0100 af r268275 : #i93945# Stop forcing long into sal_Int32. 2009-01-16 15:24:01 +0100 af r266424 : CWS-TOOLING: rebase CWS impress162 to trunk@265758 (milestone: DEV300:m38) 2008-11-21 15:17:22 +0100 af r264143 : CWS-TOOLING: rebase CWS impress162 to trunk@263288 (milestone: DEV300:m35) 2008-11-20 16:29:33 +0100 af r264067 : Merge in latest fixes to the cws command. 2008-11-20 16:25:36 +0100 af r264066 : Merge in latest fixes to the cws command. 2008-11-20 14:37:15 +0100 af r264054 : Merge in latest fixes to the cws command. 2008-11-20 14:01:36 +0100 af r264051 : Resolved merge conflicts. 2008-11-20 14:01:16 +0100 af r264050 : Resolved merge conflicts. 2008-11-19 15:45:05 +0100 af r263998 : Migrate CWS impress162 to SVN.
2009-02-19CWS-TOOLING: integrate CWS transogl03reduxOliver Bolte8-327/+2016
2009-02-09 13:59:40 +0100 thb r267511 : #i96946# Added seemingly missing change for the color space selection for the slide textures 2009-02-04 10:47:12 +0100 cmc r267353 : #i96946# integrate ogltrans work
2009-01-06CWS-TOOLING: integrate CWS impress147Rüdiger Timm10-34/+312
2008-12-16 15:51:15 +0100 wg r265553 : i96805 2008-12-03 12:32:33 +0100 wg r264766 : 96805 2008-12-03 11:40:11 +0100 wg r264761 : 96805 2008-11-20 15:39:56 +0100 cl r264062 : migrated cws from cvs to svn 2008-11-19 14:16:40 +0100 cl r263992 : CWS-TOOLING: rebase CWS impress147 to trunk@263288 (milestone: DEV300:m35)
2008-12-30CWS-TOOLING: integrate CWS hr58Jens-Heiner Rechtien1-0/+8
2008-12-29 16:47:08 +0100 hr r265821 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (x86) 2008-12-18 16:16:11 +0100 hr r265701 : #i97331#: revert to revision r265576 2008-12-18 16:00:41 +0100 hr r265699 : #i97331#: fix typo in last change 2008-12-17 18:16:18 +0100 hr r265653 : #i97331#: add comment 2008-12-17 18:11:11 +0100 hr r265652 : #i97331#: make -xc99=all again dependend on SYSBASEROOT being set 2008-12-17 01:54:23 +0100 hr r265576 : #i97331#: changes for compiling with SunStudio12 on Solaris 10 (Sparc)
2008-12-09CWS-TOOLING: integrate CWS canvas06Rüdiger Timm1-1/+2
2008-11-14 18:59:03 +0100 thb r263697 : Reverted fAlpha setup to previous state, as this was bogus as well - code path is apparently not taken for test, but anyway 2008-11-13 21:32:45 +0100 thb r263663 : WaE fix (and a bad bug as well - int color would have overflown) 2008-11-13 16:51:37 +0100 pl r263654 : remove warnings 2008-11-13 09:46:28 +0100 thb r263623 : #i95317# Fixed typo (thx WaE for finding) 2008-11-12 21:25:19 +0100 thb r263617 : #i96047# call update() on hidden sprite shape as well, to force actual hiding 2008-11-12 21:23:31 +0100 thb r263616 : #i95209# Merge from CWS thb11 - revives canvasbitmap unit tests, fixes nasty corner case in x11 salbmp (for 16bpp) 2008-11-12 21:21:46 +0100 thb r263615 : #i95197# Shuffled code to make valgrind quiet during bmp loading 2008-11-12 21:18:06 +0100 thb r263614 : #i93382# Make --disable-moz build work 2008-11-12 21:16:55 +0100 thb r263613 : #i95317# Fixed mis-named traits methods for min and max numbers 2008-11-12 20:59:01 +0100 thb r263612 : #i95317#, #i92902#: migrate CWS canvas06 to SVN.
2008-11-20CWS-TOOLING: integrate CWS impress163_DEV300Jens-Heiner Rechtien1-2/+8
2008-10-10CWS-TOOLING: integrate CWS cmcfixes49Oliver Bolte1-3/+3
2008-09-29CWS-TOOLING: integrate CWS impress160_DEV300Rüdiger Timm1-3/+3
2008-08-19INTEGRATION: CWS aw033 (1.4.58); FILE MERGEDVladimir Glazounov1-2/+3
2008/05/14 14:44:41 aw 1.4.58.2: RESYNC: (1.4-1.5); FILE MERGED 2007/12/12 13:25:05 aw 1.4.58.1: #i39532# clipping changes
2008-08-19INTEGRATION: CWS aw033 (1.6.58); FILE MERGEDVladimir Glazounov1-28/+36
2008/07/11 11:38:29 aw 1.6.58.5: RESYNC: (1.7-1.8); FILE MERGED 2008/05/14 14:44:37 aw 1.6.58.4: RESYNC: (1.6-1.7); FILE MERGED 2007/12/18 15:00:24 aw 1.6.58.3: #i39532# corrected clipping changes 2007/12/12 13:25:05 aw 1.6.58.2: #i39532# clipping changes 2007/11/22 15:11:24 aw 1.6.58.1: #i39532# polygon bezier changes
2008-08-19INTEGRATION: CWS aw033 (1.4.26); FILE MERGEDVladimir Glazounov1-26/+15
2008/07/11 11:38:20 aw 1.4.26.7: RESYNC: (1.7-1.8); FILE MERGED 2008/05/28 10:53:44 aw 1.4.26.6: #i39532# corrected clipping setup for slide when clipping is empty 2008/05/14 14:44:34 aw 1.4.26.5: RESYNC: (1.6-1.7); FILE MERGED 2007/12/18 15:00:24 aw 1.4.26.4: #i39532# corrected clipping changes 2007/12/12 13:25:05 aw 1.4.26.3: #i39532# clipping changes 2007/12/03 16:45:28 aw 1.4.26.2: RESYNC: (1.4-1.6); FILE MERGED 2007/11/22 15:11:24 aw 1.4.26.1: #i39532# polygon bezier changes
2008-08-19INTEGRATION: CWS aw033 (1.13.24); FILE MERGEDVladimir Glazounov1-3/+3
2008/07/11 11:38:26 aw 1.13.24.3: RESYNC: (1.14-1.15); FILE MERGED 2008/05/14 14:44:29 aw 1.13.24.2: RESYNC: (1.13-1.14); FILE MERGED 2007/11/22 15:11:24 aw 1.13.24.1: #i39532# polygon bezier changes
2008-07-22INTEGRATION: CWS os2port03 (1.6.34); FILE MERGEDOliver Bolte1-1/+1
2008/04/17 14:20:04 ydario 1.6.34.1: Issue number: i85203 Submitted by: ydario Reviewed by: ydario
2008-07-11INTEGRATION: CWS thb30fixes (1.3.12); FILE MERGEDRüdiger Timm1-3/+3
2008/06/20 15:27:55 thb 1.3.12.1: #i72828# Make hyperlinks work with animated shapes
2008-07-11INTEGRATION: CWS thb30fixes (1.4.10); FILE MERGEDRüdiger Timm1-2/+13
2008/06/20 15:27:55 thb 1.4.10.1: #i72828# Make hyperlinks work with animated shapes
2008-07-07INTEGRATION: CWS impress146 (1.3.14); FILE MERGEDRüdiger Timm1-5/+18
2008/06/27 10:10:08 cl 1.3.14.1: #i70772# applied patch to fix issue mit empty masks on animated images
2008-07-01INTEGRATION: CWS impress144 (1.4.8); FILE MERGEDVladimir Glazounov1-5/+5
2008/06/07 20:23:12 cl 1.4.8.1: #i85768# replaced hack properties XModel and IsChart with Model and CLSID
2008-06-24INTEGRATION: CWS canvas05 (1.14.16); FILE MERGEDKurt Zenker1-14/+15
2008/04/21 07:53:50 thb 1.14.16.4: RESYNC: (1.15-1.16); FILE MERGED 2008/01/22 14:01:19 thb 1.14.16.3: #i10000# Post-resync build breaker 2008/01/22 00:53:47 thb 1.14.16.2: RESYNC: (1.14-1.15); FILE MERGED 2007/10/01 13:49:14 thb 1.14.16.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.8.18); FILE MERGEDKurt Zenker1-4/+5
2008/04/21 07:53:56 thb 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED 2007/10/01 13:49:14 thb 1.8.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.8.18); FILE MERGEDKurt Zenker1-10/+11
2008/04/21 07:53:59 thb 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED 2007/10/01 13:49:14 thb 1.8.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.7.46); FILE MERGEDKurt Zenker1-2/+3
2008/04/21 07:53:47 thb 1.7.46.2: RESYNC: (1.7-1.8); FILE MERGED 2007/10/01 13:49:14 thb 1.7.46.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.6.46); FILE MERGEDKurt Zenker1-3/+4
2008/04/21 07:53:53 thb 1.6.46.2: RESYNC: (1.6-1.7); FILE MERGED 2007/10/01 13:49:14 thb 1.6.46.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-14/+15
2008/04/21 07:54:57 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:14 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-2/+4
2008/04/21 07:55:02 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:14 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-2/+3
2008/04/21 07:55:00 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED 2008/04/07 14:42:02 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:14 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.3.4); FILE MERGEDKurt Zenker1-10/+11
2008/04/21 07:54:53 thb 1.3.4.2: RESYNC: (1.4-1.5); FILE MERGED 2007/10/01 13:49:14 thb 1.3.4.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-13/+11
2008/04/21 07:55:31 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED 2008/01/22 00:53:45 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-6/+7
2008/04/21 07:55:28 thb 1.2.18.4: RESYNC: (1.4-1.5); FILE MERGED 2008/04/07 14:42:05 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED 2008/01/22 00:53:42 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-10/+13
2008/04/21 07:55:15 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-6/+7
2008/04/21 07:55:09 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-5/+6
2008/04/21 07:55:22 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-3/+4
2008/04/21 07:55:12 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-2/+3
2008/04/21 07:55:18 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.3.4); FILE MERGEDKurt Zenker1-8/+9
2008/04/21 07:55:25 thb 1.3.4.2: RESYNC: (1.3-1.4); FILE MERGED 2007/10/01 13:49:13 thb 1.3.4.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-20/+21
2008/04/21 07:55:06 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED 2008/01/22 00:53:39 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.2.18); FILE MERGEDKurt Zenker1-3/+4
2008/04/21 07:55:35 thb 1.2.18.3: RESYNC: (1.3-1.4); FILE MERGED 2008/04/07 14:42:08 thb 1.2.18.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:49:13 thb 1.2.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.8.18); FILE MERGEDKurt Zenker1-4/+5
2008/04/21 07:54:08 thb 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED 2007/10/01 13:49:12 thb 1.8.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.7.18); FILE MERGEDKurt Zenker1-2/+2
2008/04/21 07:54:05 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED 2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.7.18); FILE MERGEDKurt Zenker1-4/+4
2008/04/21 07:54:14 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED 2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.7.18); FILE MERGEDKurt Zenker1-3/+4
2008/04/21 07:54:32 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED 2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.11.18); FILE MERGEDKurt Zenker1-2/+3
2008/04/21 07:54:17 thb 1.11.18.2: RESYNC: (1.11-1.12); FILE MERGED 2007/10/01 13:49:12 thb 1.11.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.11.18); FILE MERGEDKurt Zenker1-5/+5
2008/04/21 07:54:26 thb 1.11.18.2: RESYNC: (1.11-1.12); FILE MERGED 2007/10/01 13:49:12 thb 1.11.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.7.18); FILE MERGEDKurt Zenker1-2/+2
2008/04/21 07:54:23 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED 2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.9.18); FILE MERGEDKurt Zenker1-8/+8
2008/04/21 07:54:02 thb 1.9.18.2: RESYNC: (1.9-1.10); FILE MERGED 2007/10/01 13:49:12 thb 1.9.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.8.10); FILE MERGEDKurt Zenker1-2/+2
2008/04/21 07:54:29 thb 1.8.10.2: RESYNC: (1.8-1.9); FILE MERGED 2007/10/01 13:49:12 thb 1.8.10.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.11.18); FILE MERGEDKurt Zenker1-11/+11
2008/04/21 07:54:20 thb 1.11.18.3: RESYNC: (1.12-1.13); FILE MERGED 2008/01/22 00:53:36 thb 1.11.18.2: RESYNC: (1.11-1.12); FILE MERGED 2007/10/01 13:49:12 thb 1.11.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.7.18); FILE MERGEDKurt Zenker1-3/+3
2008/04/21 07:54:35 thb 1.7.18.2: RESYNC: (1.7-1.8); FILE MERGED 2007/10/01 13:49:12 thb 1.7.18.1: #i79258# Merge from CWS picom
2008-06-24INTEGRATION: CWS canvas05 (1.14.18); FILE MERGEDKurt Zenker1-4/+4
2008/04/21 07:54:38 thb 1.14.18.2: RESYNC: (1.14-1.15); FILE MERGED 2007/10/01 13:49:12 thb 1.14.18.1: #i79258# Merge from CWS picom