strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12151 commits 9 branches 795 tags 2.1 GiB
Commit graph

1222 commits

Author SHA1 Message Date
Jens-Heiner Rechtien
04a678277a CWS-TOOLING: integrate CWS cairocanvastext01 
2009-05-12 07:10:00 +0200 mox  r271795 : Rename ::GetLayoutData() to ::GetSysTextLayoutData() to avoid build
breakage in sc module.
2009-05-11 23:40:57 +0200 mox  r271794 : merge fixes (again). These files should have been removed by the rebase.
2009-05-11 20:17:44 +0200 mox  r271791 : fix build breakage on UNX
2009-05-11 16:53:15 +0200 mox  r271779 : Documentation fix
2009-05-11 16:49:16 +0200 mox  r271778 : merge fixes
2009-05-11 14:10:36 +0200 mox  r271769 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@271427 (milestone: DEV300:m47)
2009-05-11 10:55:11 +0200 mox  r271760 : merge fixes
2009-05-11 10:49:44 +0200 mox  r271759 : manual merge to DEV300_m47
2009-05-11 10:42:11 +0200 mox  r271758 : merge fixes
2009-05-11 10:29:16 +0200 mox  r271757 : Manual merge to DEV300_m47
2009-05-11 10:21:13 +0200 mox  r271756 : manual merge to DEV300_m47
2009-05-11 10:10:29 +0200 mox  r271755 : manual merge to DEV300_m47
2009-05-11 10:01:33 +0200 mox  r271754 : Manual merge to DEV300_m47
2009-05-11 09:59:30 +0200 mox  r271753 : manual merge to DEV300_m47
2009-05-11 09:57:33 +0200 mox  r271752 : merge fixes
2009-05-11 09:56:05 +0200 mox  r271751 : merge fixes
2009-05-11 09:53:26 +0200 mox  r271749 : Manual merge to DEV300_m47
2009-05-11 09:49:34 +0200 mox  r271748 : manual merge to DEV300_m47
2009-05-11 09:43:20 +0200 mox  r271747 : manual merge to DEV300_m47
2009-05-11 09:30:10 +0200 mox  r271745 : Manual merge to DEV300_m47
2009-05-11 09:28:59 +0200 mox  r271744 : manual merge to DEV300_m47
2009-05-11 09:24:49 +0200 mox  r271743 : Fix to merge
2009-05-11 09:21:55 +0200 mox  r271742 : Manual merge to DEV300_m47
2009-05-11 09:18:13 +0200 mox  r271741 : merge fixes
2009-05-11 09:00:50 +0200 mox  r271739 : Manual merge to DEV300_m47
2009-05-09 13:26:10 +0200 mox  r271734 : cleanup
2009-05-09 13:17:22 +0200 mox  r271733 : WNT build fixes
2009-05-09 09:23:59 +0200 mox  r271732 : Implement proper cross-platform font width calculation
Implement faux bold support
2009-02-21 19:47:08 +0100 mox  r268339 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@267171 (milestone: DEV300:m41)
2009-01-19 21:51:21 +0100 mox  r266530 : Fix compilation on win32
2009-01-19 21:37:20 +0100 mox  r266529 : Fix typo
2009-01-19 21:35:28 +0100 mox  r266528 : Better debug
2009-01-19 21:13:30 +0100 mox  r266527 : Win32 fixes for proper text rendering
2009-01-19 21:12:56 +0100 mox  r266526 : Win32 fixes for proper text rendering
2008-12-27 13:04:05 +0100 mox  r265814 : configure fixes
2008-12-27 11:37:00 +0100 mox  r265813 : x86_64 works only with system-cairo
2008-12-26 20:02:32 +0100 mox  r265809 : Use the fix for 64bit builds
2008-12-25 16:58:11 +0100 mox  r265802 : Fix build breaker on WNT
2008-12-24 23:04:58 +0100 mox  r265801 : Unbreak build after rebase.
2008-12-23 18:52:32 +0100 mox  r265790 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@265758 (milestone: DEV300:m38)
2008-12-23 18:23:09 +0100 mox  r265789 : Fix the fix
2008-12-23 18:21:27 +0100 mox  r265788 : Fix OS2 stuff
2008-12-11 19:50:40 +0100 mox  r265354 : Fix build breaker on Mac
2008-12-09 22:00:53 +0100 mox  r265139 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@264807 (milestone: DEV300:m37)
2008-12-08 23:02:32 +0100 thb  r265052 : Removed outdated parts from readme
2008-12-08 22:26:54 +0100 mox  r265051 : cleanup
2008-12-07 19:55:31 +0100 mox  r264967 : Fix for non-intel processors.
2008-12-07 19:47:11 +0100 mox  r264963 : sysdata fixes
2008-12-07 19:23:27 +0100 mox  r264959 : Sysdata fixes
2008-12-07 19:01:48 +0100 mox  r264958 : Fix sysdata usage
2008-12-07 11:41:33 +0100 mox  r264951 : sysdata fixes
2008-12-07 11:38:32 +0100 mox  r264950 : sysdata fixes
2008-12-06 23:15:06 +0100 mox  r264947 : Try to fix error: __sync_val_compare_and_swap_4 
2008-12-06 23:09:30 +0100 mox  r264945 : Revert unnecessary change.
2008-12-06 23:04:40 +0100 mox  r264944 : Use pre/postx from tools module.
2008-12-06 22:49:08 +0100 mox  r264943 : Use proper pre/post includes.
2008-12-06 22:48:03 +0100 mox  r264942 : Use pre/postx from tools module.
2008-12-06 22:24:10 +0100 mox  r264941 : Fix build breaker.
2008-12-06 21:55:46 +0100 mox  r264940 : Make pre/postx.h properly available
2008-12-06 21:54:23 +0100 mox  r264939 : Make pre/postx.h properly available.
2008-12-06 21:43:09 +0100 mox  r264938 : Try to fix error: __sync_val_compare_and_swap_4 
2008-12-06 21:12:18 +0100 mox  r264937 : Remove obsolete pre-built binaries
2008-12-06 21:07:40 +0100 mox  r264936 : WNT: do not hardcode pixman version in cairo build
2008-12-06 19:26:44 +0100 mox  r264934 : Revert pixman upgrade.
2008-12-06 18:35:14 +0100 mox  r264933 : Fix build breaker
2008-12-06 18:31:11 +0100 mox  r264932 : Use static pixman lib on unx/32bit to avoid linking problems
2008-12-06 17:22:52 +0100 mox  r264930 : Update pixman to 0.13.2
2008-12-06 13:30:41 +0100 mox  r264928 : Fix accidentally changed property
2008-12-06 13:09:00 +0100 mox  r264927 : Fix accidental prop changes
2008-12-06 12:40:08 +0100 mox  r264926 : Fix build breaker on Win32
2008-12-06 12:39:22 +0100 mox  r264925 : Fix build breaker on Win32
2008-12-06 12:30:23 +0100 mox  r264924 : Fix build breakers on win32
2008-12-06 11:45:33 +0100 mox  r264923 : revert.
2008-12-06 11:43:05 +0100 mox  r264922 : Try to fix header include problems on WNT
2008-12-06 09:57:35 +0100 mox  r264921 : Cleanup accidental props
2008-11-29 14:43:51 +0100 mox  r264580 : Move headers around to make all platforms compile
2008-11-29 14:41:59 +0100 mox  r264579 : WaE fixes for X11
2008-11-29 13:13:49 +0100 mox  r264578 : Fix build breaker on linux
2008-11-29 12:21:03 +0100 mox  r264577 : Fix build breaker
2008-11-29 12:13:50 +0100 mox  r264576 : Try to fix build breaker
2008-11-28 22:51:27 +0100 mox  r264573 : Revert header includes to common style
2008-11-18 18:59:15 +0100 mox  r263794 : Fix build breaker.
2008-11-17 20:28:19 +0100 mox  r263740 : Revert most configure hacks
2008-11-17 20:12:51 +0100 mox  r263739 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@263288 (milestone: DEV300:m35)
2008-11-14 21:22:22 +0100 mox  r263698 : ZLIB_FIX define set
2008-11-14 18:48:22 +0100 mox  r263694 : hardcode zlib paths
2008-11-14 16:23:07 +0100 mox  r263683 : Fix typo
2008-11-13 20:16:13 +0100 mox  r263662 : WaE fix
2008-11-13 19:44:29 +0100 mox  r263661 : Properly include zlib headers for win32
2008-11-12 20:05:51 +0100 mox  r263610 : Add debugging code.
2008-11-10 19:44:35 +0100 mox  r263537 : Try to fix build breaker
2008-11-09 22:34:35 +0100 mox  r263504 : Remove accidentally added svn:ignore properties.
2008-11-09 22:33:21 +0100 mox  r263503 : prop should be actually deleted.
2008-11-09 22:30:06 +0100 mox  r263502 : props should be empty.
2008-11-09 22:23:22 +0100 mox  r263501 : Try fix props again...
2008-11-09 22:11:26 +0100 mox  r263500 : try to fix svn:ignore
2008-11-09 21:30:01 +0100 mox  r263499 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@262620 (milestone: DEV300:m34)
2008-11-09 20:30:55 +0100 mox  r263498 : add missing cairo patch
2008-11-09 10:56:33 +0100 mox  r263494 : Resync cairo module with cws cairosource01
2008-11-01 09:32:19 +0100 mox  r262870 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk@262620 (milestone: DEV300:m34)
2008-10-26 20:55:48 +0100 mox  r262663 : Fix build breaker
2008-10-25 13:10:00 +0200 mox  r262662 : CWS rebase to m33
2008-10-12 19:47:56 +0200 mox  r262170 : Migrate CWS cairocanvastext01 to SVN.
 2009-05-18 12:01:49 +00:00
Ivo Hinkelmann
a2a1077077 CWS-TOOLING: integrate CWS sb107 
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-04-27 11:24:10 +00:00
Oliver Bolte
f0367a8826 CWS-TOOLING: integrate CWS cmcfixes54 
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-03-05 07:09:20 +00:00
Oliver Bolte
9ae35d4e8d CWS-TOOLING: integrate CWS impress162 
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-27 08:11:53 +00:00
Oliver Bolte
57060ba91a CWS-TOOLING: integrate CWS transogl03redux 
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-02-19 13:21:10 +00:00
Rüdiger Timm
5d06990ec5 CWS-TOOLING: integrate CWS impress147 
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)
 2009-01-06 08:40:41 +00:00
Jens-Heiner Rechtien
ea23c78253 CWS-TOOLING: integrate CWS hr58 
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-30 13:48:34 +00:00
Rüdiger Timm
d4fe0312f5 CWS-TOOLING: integrate CWS canvas06 
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-12-09 13:22:21 +00:00
Jens-Heiner Rechtien
f7a9b6b5c3 CWS-TOOLING: integrate CWS impress163_DEV300 2008-11-20 14:55:36 +00:00
Oliver Bolte
3808553504 CWS-TOOLING: integrate CWS cmcfixes49 2008-10-10 13:02:43 +00:00
Rüdiger Timm
9ff911b877 CWS-TOOLING: integrate CWS impress160_DEV300 2008-09-29 11:39:44 +00:00
Vladimir Glazounov
40fc2023ff INTEGRATION: CWS aw033 (1.4.58); FILE MERGED 
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-19 23:08:15 +00:00
Vladimir Glazounov
e9a2a60067 INTEGRATION: CWS aw033 (1.6.58); FILE MERGED 
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-19 23:08:03 +00:00
Vladimir Glazounov
f7566bb05d INTEGRATION: CWS aw033 (1.4.26); FILE MERGED 
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-19 23:07:51 +00:00
Vladimir Glazounov
ff3b826e6b INTEGRATION: CWS aw033 (1.13.24); FILE MERGED 
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-08-19 23:07:40 +00:00
Oliver Bolte
9f89370620 INTEGRATION: CWS os2port03 (1.6.34); FILE MERGED 
2008/04/17 14:20:04 ydario 1.6.34.1: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
 2008-07-22 15:56:00 +00:00
Rüdiger Timm
f280a23973 INTEGRATION: CWS thb30fixes (1.3.12); FILE MERGED 
2008/06/20 15:27:55 thb 1.3.12.1: #i72828# Make hyperlinks work with animated shapes
 2008-07-11 06:09:10 +00:00
Rüdiger Timm
ad0a460b9e INTEGRATION: CWS thb30fixes (1.4.10); FILE MERGED 
2008/06/20 15:27:55 thb 1.4.10.1: #i72828# Make hyperlinks work with animated shapes
 2008-07-11 06:08:56 +00:00
Rüdiger Timm
c15f08eb65 INTEGRATION: CWS impress146 (1.3.14); FILE MERGED 
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-07 12:48:13 +00:00
Vladimir Glazounov
06a5166cb0 INTEGRATION: CWS impress144 (1.4.8); FILE MERGED 
2008/06/07 20:23:12 cl 1.4.8.1: #i85768# replaced hack properties XModel and IsChart with Model and CLSID
 2008-07-01 12:45:09 +00:00
Kurt Zenker
ee29582f65 INTEGRATION: CWS canvas05 (1.14.16); FILE MERGED 
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-24 11:14:57 +00:00
Kurt Zenker
ff0a0fb6a4 INTEGRATION: CWS canvas05 (1.8.18); FILE MERGED 
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-24 11:14:33 +00:00
Kurt Zenker
682ecc3210 INTEGRATION: CWS canvas05 (1.8.18); FILE MERGED 
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-24 11:14:15 +00:00
Kurt Zenker
41070d7ea6 INTEGRATION: CWS canvas05 (1.7.46); FILE MERGED 
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-24 11:14:01 +00:00
Kurt Zenker
d3b17bdb71 INTEGRATION: CWS canvas05 (1.6.46); FILE MERGED 
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-24 11:13:46 +00:00
Kurt Zenker
bae896db02 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:13:32 +00:00
Kurt Zenker
2b9e7db7c5 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:13:11 +00:00
Kurt Zenker
1a5f60c08c INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:12:57 +00:00
Kurt Zenker
617e8a09ac INTEGRATION: CWS canvas05 (1.3.4); FILE MERGED 
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-24 11:12:44 +00:00
Kurt Zenker
5f3b3f0212 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:12:26 +00:00
Kurt Zenker
6b2b389f10 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:12:06 +00:00
Kurt Zenker
cb40579728 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:11:49 +00:00
Kurt Zenker
54a90b5059 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:11:37 +00:00
Kurt Zenker
e4fbbf410e INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:11:21 +00:00
Kurt Zenker
fce7fc1fa7 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:11:04 +00:00
Kurt Zenker
651402cce0 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:10:46 +00:00
Kurt Zenker
cacbe1d7f6 INTEGRATION: CWS canvas05 (1.3.4); FILE MERGED 
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-24 11:10:33 +00:00
Kurt Zenker
57c025d9a5 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:10:16 +00:00
Kurt Zenker
6237733fa1 INTEGRATION: CWS canvas05 (1.2.18); FILE MERGED 
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-24 11:09:41 +00:00
Kurt Zenker
c912d5575b INTEGRATION: CWS canvas05 (1.8.18); FILE MERGED 
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-24 11:09:23 +00:00
Kurt Zenker
056910b69e INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED 
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-24 11:09:08 +00:00
Kurt Zenker
a23557d092 INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED 
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-24 11:08:55 +00:00
Kurt Zenker
7012d06de0 INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED 
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-24 11:08:41 +00:00
Kurt Zenker
830b177517 INTEGRATION: CWS canvas05 (1.11.18); FILE MERGED 
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-24 11:08:27 +00:00
Kurt Zenker
fdf086a1c2 INTEGRATION: CWS canvas05 (1.11.18); FILE MERGED 
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-24 11:08:13 +00:00
Kurt Zenker
f8f76a33c2 INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED 
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-24 11:07:54 +00:00
Kurt Zenker
21ffcfa957 INTEGRATION: CWS canvas05 (1.9.18); FILE MERGED 
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-24 11:07:40 +00:00
Kurt Zenker
0d10b0662a INTEGRATION: CWS canvas05 (1.8.10); FILE MERGED 
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-24 11:07:27 +00:00
Kurt Zenker
d87412f8f2 INTEGRATION: CWS canvas05 (1.11.18); FILE MERGED 
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-24 11:07:15 +00:00
Kurt Zenker
d9efaa0ca5 INTEGRATION: CWS canvas05 (1.7.18); FILE MERGED 
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-24 11:06:58 +00:00