]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
12 years agoUpdate widths before heights to optimize for measuring widgets (#8313)
Leif Åstrand [Tue, 14 Feb 2012 14:33:54 +0000 (16:33 +0200)]
Update widths before heights to optimize for measuring widgets (#8313)

12 years agoProperly update height and width of tab content (#8313)
Leif Åstrand [Tue, 14 Feb 2012 14:26:22 +0000 (16:26 +0200)]
Properly update height and width of tab content (#8313)

12 years agoRun layouts when Window size changed (#8313)
Leif Åstrand [Tue, 14 Feb 2012 14:04:56 +0000 (16:04 +0200)]
Run layouts when Window size changed (#8313)

12 years agoIncrease visibility of contentNode field (#8313)
Leif Åstrand [Tue, 14 Feb 2012 10:36:20 +0000 (12:36 +0200)]
Increase visibility of contentNode field (#8313)

12 years agoUpdate tab sheet and accordion to work with MeasureManager (#8313)
Leif Åstrand [Tue, 14 Feb 2012 10:34:56 +0000 (12:34 +0200)]
Update tab sheet and accordion to work with MeasureManager (#8313)

12 years agoSome small tweaks to the split panels (#8313)
Leif Åstrand [Tue, 14 Feb 2012 10:31:23 +0000 (12:31 +0200)]
Some small tweaks to the split panels (#8313)

12 years agoUpdate ResizeRequired paintable even if only width has changed (#8313)
Leif Åstrand [Tue, 14 Feb 2012 10:30:19 +0000 (12:30 +0200)]
Update ResizeRequired paintable even if only width has changed (#8313)

12 years agoSplitPanel working with the MeasureManager (#8313)
Leif Åstrand [Tue, 14 Feb 2012 08:34:16 +0000 (10:34 +0200)]
SplitPanel working with the MeasureManager (#8313)

12 years agoFormLayout without calculations (#8313)
Leif Åstrand [Tue, 14 Feb 2012 07:26:39 +0000 (09:26 +0200)]
FormLayout without calculations (#8313)

12 years agoForm without own measuring (#8313)
Leif Åstrand [Tue, 14 Feb 2012 07:08:27 +0000 (09:08 +0200)]
Form without own measuring (#8313)

12 years agoUpdate Window to work with MeasureManager (#8313)
Leif Åstrand [Mon, 13 Feb 2012 17:31:17 +0000 (19:31 +0200)]
Update Window to work with MeasureManager (#8313)

12 years agoRefactor to calculate heights and widths separately (#8313)
Leif Åstrand [Mon, 13 Feb 2012 14:49:32 +0000 (16:49 +0200)]
Refactor to calculate heights and widths separately (#8313)

12 years agoUpdate text field height for border-box sizing (#8313)
Leif Åstrand [Mon, 13 Feb 2012 14:41:20 +0000 (16:41 +0200)]
Update text field height for border-box sizing (#8313)

12 years agoCustomLayout without size calculations (#8313)
Leif Åstrand [Fri, 10 Feb 2012 12:56:38 +0000 (14:56 +0200)]
CustomLayout without size calculations (#8313)

12 years agoMerge branch 'master' into layoutperformance
Leif Åstrand [Fri, 10 Feb 2012 12:14:57 +0000 (14:14 +0200)]
Merge branch 'master' into layoutperformance

12 years agoAlso find paintables inside HasOneWidget widgets (#8323)
Leif Åstrand [Fri, 10 Feb 2012 12:14:22 +0000 (14:14 +0200)]
Also find paintables inside HasOneWidget widgets (#8323)

12 years agoCustomComponent without size calculations (#8313)
Leif Åstrand [Fri, 10 Feb 2012 12:06:32 +0000 (14:06 +0200)]
CustomComponent without size calculations (#8313)

12 years agoUpdate CssLayout to work with CalculatingLayotus (#8313)
Leif Åstrand [Fri, 10 Feb 2012 12:02:59 +0000 (14:02 +0200)]
Update CssLayout to work with CalculatingLayotus (#8313)

This is the slowest GridLayout ever, as it measures an calculates even
more than the version from Vaadin 6

12 years agoRemove almost unused CellBasedLayout (#8313)
Leif Åstrand [Fri, 10 Feb 2012 09:59:18 +0000 (11:59 +0200)]
Remove almost unused CellBasedLayout (#8313)

12 years agoUpdate CssLayout to use MeasureManager (#8313)
Leif Åstrand [Fri, 10 Feb 2012 09:29:40 +0000 (11:29 +0200)]
Update CssLayout to use MeasureManager (#8313)

12 years agoUse minWidth to make room for caption reducing the size (#8313)
Leif Åstrand [Fri, 10 Feb 2012 09:20:51 +0000 (11:20 +0200)]
Use minWidth to make room for caption reducing the size (#8313)

12 years agoSet some basic styles in css (#8313)
Leif Åstrand [Fri, 10 Feb 2012 08:32:20 +0000 (10:32 +0200)]
Set some basic styles in css (#8313)

12 years agoSimplify size handling in VView (#8313)
Leif Åstrand [Thu, 9 Feb 2012 18:25:00 +0000 (20:25 +0200)]
Simplify size handling in VView (#8313)

12 years agoUse box-sizing: border-box for all paintables (#8313)
Leif Åstrand [Thu, 9 Feb 2012 18:13:40 +0000 (20:13 +0200)]
Use box-sizing: border-box for all paintables (#8313)

12 years agoUpdate CssLayout to work with CalculatingLayotus (#8313)
Leif Åstrand [Thu, 9 Feb 2012 14:36:53 +0000 (16:36 +0200)]
Update CssLayout to work with CalculatingLayotus (#8313)

12 years agoAvoid setting margin styles to spacing element (#8313)
Leif Åstrand [Thu, 9 Feb 2012 14:24:38 +0000 (16:24 +0200)]
Avoid setting margin styles to spacing element (#8313)

12 years agoUpdate AbsoluteLayout to be a CalculatingLayout (#8313)
Leif Åstrand [Thu, 9 Feb 2012 13:48:59 +0000 (15:48 +0200)]
Update AbsoluteLayout to be a CalculatingLayout (#8313)

It is still doing measurements of its own, which causes reflows.

12 years agoMerge branch 'master' into layoutperformance
Leif Åstrand [Thu, 9 Feb 2012 12:51:41 +0000 (14:51 +0200)]
Merge branch 'master' into layoutperformance

12 years agoRemove paintableToId now that each VPaintable knows its own pid (#8323)
Leif Åstrand [Thu, 9 Feb 2012 12:50:59 +0000 (14:50 +0200)]
Remove paintableToId now that each VPaintable knows its own pid (#8323)

12 years agoRefactor to use LayoutSlot for children (#8313)
Leif Åstrand [Thu, 9 Feb 2012 12:45:12 +0000 (14:45 +0200)]
Refactor to use LayoutSlot for children (#8313)

12 years agoCleanup and refactoring (#8313)
Leif Åstrand [Wed, 8 Feb 2012 14:58:37 +0000 (16:58 +0200)]
Cleanup and refactoring (#8313)

12 years agoUpdate selectors for the new DOM structure (#8313)
Leif Åstrand [Wed, 8 Feb 2012 14:45:45 +0000 (16:45 +0200)]
Update selectors for the new DOM structure (#8313)

12 years agoMeasure borders, margins and paddings (#8313)
Leif Åstrand [Wed, 8 Feb 2012 14:44:50 +0000 (16:44 +0200)]
Measure borders, margins and paddings (#8313)

12 years agoUse the more generic GWT Element class
Leif Åstrand [Wed, 8 Feb 2012 14:43:22 +0000 (16:43 +0200)]
Use the more generic GWT Element class

12 years agoRemove unused ApplicationConnection.updateComponentSize (#8313)
Leif Åstrand [Wed, 8 Feb 2012 14:42:37 +0000 (16:42 +0200)]
Remove unused ApplicationConnection.updateComponentSize (#8313)

12 years agoProvide sizing information for paintables (#8313)
Leif Åstrand [Wed, 8 Feb 2012 14:37:41 +0000 (16:37 +0200)]
Provide sizing information for paintables (#8313)

12 years agoRemove support for Select in multi-select mode (#8169, #8326).
Henri Sara [Wed, 8 Feb 2012 12:18:08 +0000 (14:18 +0200)]
Remove support for Select in multi-select mode (#8169, #8326).

Also includes some related cleanup as this was the last special case
where the widget was selected on the client side based on UIDL fields
other than tag.

12 years agoMerge remote branch 'origin/master' into layoutperformance
Leif Åstrand [Wed, 8 Feb 2012 07:21:24 +0000 (09:21 +0200)]
Merge remote branch 'origin/master' into layoutperformance

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
src/com/vaadin/terminal/gwt/client/ui/VOrderedLayoutPaintable.java

12 years agogetParent() shouldn't throw npe when widget's parent is null (#8323)
Leif Åstrand [Wed, 8 Feb 2012 07:06:15 +0000 (09:06 +0200)]
getParent() shouldn't throw npe when widget's parent is null (#8323)

12 years agoAvoid caching parent for now as the cache is never cleared
Artur Signell [Tue, 7 Feb 2012 16:13:58 +0000 (18:13 +0200)]
Avoid caching parent for now as the cache is never cleared

12 years ago#8325 Move ApplicationConnection.updateComponent to
Artur Signell [Tue, 7 Feb 2012 14:09:21 +0000 (16:09 +0200)]
#8325 Move ApplicationConnection.updateComponent to
VAbstractPaintableWidget.updateFromUIDL

12 years agoMake container instead of child depend on child caption (#8313)
Leif Åstrand [Tue, 7 Feb 2012 13:07:09 +0000 (15:07 +0200)]
Make container instead of child depend on child caption (#8313)

12 years agoStore MeasuredSize instance in VAbstractPaintableWidget (#8313)
Leif Åstrand [Tue, 7 Feb 2012 12:52:46 +0000 (14:52 +0200)]
Store MeasuredSize instance in VAbstractPaintableWidget (#8313)

12 years agogetParent() shouldn't throw npe when widget's parent is null
Leif Åstrand [Tue, 7 Feb 2012 12:39:40 +0000 (14:39 +0200)]
getParent() shouldn't throw npe when widget's parent is null

12 years agoUse one MeasureManager per ApplicationConnection
Leif Åstrand [Tue, 7 Feb 2012 12:07:28 +0000 (14:07 +0200)]
Use one MeasureManager per ApplicationConnection

12 years agoRemove some references to Container
Leif Åstrand [Tue, 7 Feb 2012 12:02:36 +0000 (14:02 +0200)]
Remove some references to Container

12 years agoUse VPaintableWidgetContainer.getChildren() instead of static helper
Leif Åstrand [Tue, 7 Feb 2012 11:48:36 +0000 (13:48 +0200)]
Use VPaintableWidgetContainer.getChildren() instead of static helper

12 years agoMerge branch 'master' into layoutperformance
Leif Åstrand [Tue, 7 Feb 2012 11:46:27 +0000 (13:46 +0200)]
Merge branch 'master' into layoutperformance

12 years agoFix file that was accidentally emptied in previous commit
Leif Åstrand [Tue, 7 Feb 2012 11:24:23 +0000 (13:24 +0200)]
Fix file that was accidentally emptied in previous commit

12 years agoFix broken newlines from previous commit
Leif Åstrand [Tue, 7 Feb 2012 11:22:09 +0000 (13:22 +0200)]
Fix broken newlines from previous commit

12 years agoAdd VPaintableWidgetContainer.getChildren() (#8323)
Leif Åstrand [Tue, 7 Feb 2012 11:19:09 +0000 (13:19 +0200)]
Add VPaintableWidgetContainer.getChildren() (#8323)

12 years agoSplit measuring ordered layout to paintable and widget (#8324)
Leif Åstrand [Tue, 7 Feb 2012 10:10:40 +0000 (12:10 +0200)]
Split measuring ordered layout to paintable and widget (#8324)

12 years agoMerge remote branch 'origin/master' into layoutperformance
Leif Åstrand [Tue, 7 Feb 2012 08:58:50 +0000 (10:58 +0200)]
Merge remote branch 'origin/master' into layoutperformance

Conflicts:
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/VPaintableMap.java
src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java

12 years ago#8323 Renamed getParentPaintable to getParent and cache the
Artur Signell [Tue, 7 Feb 2012 08:32:50 +0000 (10:32 +0200)]
#8323 Renamed getParentPaintable to getParent and cache the
parentvalue. Should still be changed so that the framework constructs
the paintable hierarchy and sets it to the paintables.

12 years ago#8324 Automatically set paintable id when paintable is created
Artur Signell [Tue, 7 Feb 2012 08:04:05 +0000 (10:04 +0200)]
#8324 Automatically set paintable id when paintable is created

12 years agoMore generic way of measuring captions
Leif Åstrand [Mon, 6 Feb 2012 14:26:03 +0000 (16:26 +0200)]
More generic way of measuring captions

12 years agoMerge remote-tracking branch 'origin/6.8'
Artur Signell [Mon, 6 Feb 2012 10:36:48 +0000 (12:36 +0200)]
Merge remote-tracking branch 'origin/6.8'

12 years ago#6718 Fixed more regressions, refactored a bit
Johannes Dahlström [Mon, 6 Feb 2012 09:45:33 +0000 (09:45 +0000)]
#6718 Fixed more regressions, refactored a bit

svn changeset:22917/svn branch:6.8

12 years agoMerge remote-tracking branch 'origin/6.8'
Artur Signell [Mon, 6 Feb 2012 06:58:33 +0000 (08:58 +0200)]
Merge remote-tracking branch 'origin/6.8'

12 years agoFixed compilation errors introduced by merge from 6.8
Artur Signell [Mon, 6 Feb 2012 06:58:11 +0000 (08:58 +0200)]
Fixed compilation errors introduced by merge from 6.8

12 years agoUse value change listeners instead of click listeners for checkboxes
Artur Signell [Mon, 6 Feb 2012 06:52:47 +0000 (06:52 +0000)]
Use value change listeners instead of click listeners for checkboxes

svn changeset:22912/svn branch:6.7

12 years agoUse value change listeners instead of click listeners for checkboxes
Artur Signell [Mon, 6 Feb 2012 06:56:11 +0000 (06:56 +0000)]
Use value change listeners instead of click listeners for checkboxes

svn changeset:22914/svn branch:6.7

12 years agoUse value change listeners instead of click listeners for checkboxes
Artur Signell [Mon, 6 Feb 2012 06:52:47 +0000 (06:52 +0000)]
Use value change listeners instead of click listeners for checkboxes

svn changeset:22912/svn branch:6.7

12 years ago#8311 Corrected newlines in new files
Artur Signell [Fri, 3 Feb 2012 20:31:12 +0000 (22:31 +0200)]
#8311 Corrected newlines in new files

12 years agoMerge remote-tracking branch 'origin/6.8'
Artur Signell [Fri, 3 Feb 2012 20:26:47 +0000 (22:26 +0200)]
Merge remote-tracking branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
tests/test.xml

12 years agoMerge commit '98737932a588f1b4a8f8115f2545da63ae7f4e4a'
Artur Signell [Fri, 3 Feb 2012 20:20:34 +0000 (22:20 +0200)]
Merge commit '98737932a588f1b4a8f8115f2545da63ae7f4e4a'

Conflicts:
WebContent/VAADIN/themes/base/button/button.css
WebContent/VAADIN/themes/runo/button/button.css
tests/integration_tests.xml

12 years agoMerge commit '7c200d4e869139ff72e848e973cd5ce5932908d8'
Artur Signell [Fri, 3 Feb 2012 20:17:21 +0000 (22:17 +0200)]
Merge commit '7c200d4e869139ff72e848e973cd5ce5932908d8'

Conflicts:
tests/testbench/com/vaadin/tests/components/datefield/InlineDateFieldResolutionMsec.html
tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldResolutions.html
tests/testbench/com/vaadin/tests/components/splitpanel/HorizontalSplitPanelBasicStates.html
tests/testbench/com/vaadin/tests/components/splitpanel/VerticalSplitPanelBasicStates.html
tests/testbench/com/vaadin/tests/components/textfield/TextFieldSecret.html
tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.html

12 years agoMerge commit 'c8dbc2549267d3660a1cca04630391dc8d6fd014'
Artur Signell [Fri, 3 Feb 2012 20:10:15 +0000 (22:10 +0200)]
Merge commit 'c8dbc2549267d3660a1cca04630391dc8d6fd014'

12 years agoUpdated test to take into account removed SplitPanel
Artur Signell [Fri, 3 Feb 2012 20:06:25 +0000 (22:06 +0200)]
Updated test to take into account removed SplitPanel

12 years ago#8324 Set connection for VViewPaintable when initializing
Artur Signell [Fri, 3 Feb 2012 19:50:31 +0000 (21:50 +0200)]
#8324 Set connection for VViewPaintable when initializing

12 years agoFixed test - old IEs do not provide any button for double clicks
Artur Signell [Fri, 3 Feb 2012 18:30:53 +0000 (18:30 +0000)]
Fixed test - old IEs do not provide any button for double clicks

svn changeset:22899/svn branch:6.7

12 years ago#8324 Corrected paintable hierarchy as VScrollTableRow is no longer a
Artur Signell [Fri, 3 Feb 2012 18:27:38 +0000 (20:27 +0200)]
#8324 Corrected paintable hierarchy as VScrollTableRow is no longer a
paintable

12 years ago#8324 Fixed problem with nodes being added to the wrong widget
Artur Signell [Fri, 3 Feb 2012 18:10:28 +0000 (20:10 +0200)]
#8324 Fixed problem with nodes being added to the wrong widget

12 years agoFixed invalid comparison between paintable and widget
Artur Signell [Fri, 3 Feb 2012 16:31:35 +0000 (18:31 +0200)]
Fixed invalid comparison between paintable and widget

12 years agoThrow an error if directory listing fails
Artur Signell [Fri, 3 Feb 2012 15:22:17 +0000 (15:22 +0000)]
Throw an error if directory listing fails

svn changeset:22890/svn branch:6.7

12 years ago#8345, #8346 Window drag and resize are now activated only by the left mouse button
Artur Signell [Fri, 3 Feb 2012 15:02:50 +0000 (15:02 +0000)]
#8345, #8346 Window drag and resize are now activated only by the left mouse button

svn changeset:22889/svn branch:6.7

12 years ago#8343, #8344 Column resize and sort are now activated only by the left mouse button
Artur Signell [Fri, 3 Feb 2012 15:01:18 +0000 (15:01 +0000)]
#8343, #8344 Column resize and sort are now activated only by the left mouse button

svn changeset:22888/svn branch:6.7

12 years ago#8284, #8336 Fixed header and footer click for right and middle click. Browser contex...
Artur Signell [Fri, 3 Feb 2012 15:00:39 +0000 (15:00 +0000)]
#8284, #8336 Fixed header and footer click for right and middle click. Browser context menu is also disabled on right click when there is a click listener.

svn changeset:22887/svn branch:6.7

12 years agoReversed browser start logic, use --gui to start the browser automatically. By defaul...
Artur Signell [Fri, 3 Feb 2012 12:26:26 +0000 (12:26 +0000)]
Reversed browser start logic, use --gui to start the browser automatically. By default does not start a browser.

svn changeset:22878/svn branch:6.7

12 years ago#8342 Test using Firefox 10
Artur Signell [Fri, 3 Feb 2012 12:24:52 +0000 (12:24 +0000)]
#8342 Test using Firefox 10

svn changeset:22876/svn branch:6.7

12 years ago#8324 Fixed comparison of paintable and widget
Artur Signell [Thu, 2 Feb 2012 16:22:11 +0000 (18:22 +0200)]
#8324 Fixed comparison of paintable and widget

12 years agoCorrected license info
Artur Signell [Thu, 2 Feb 2012 16:12:42 +0000 (18:12 +0200)]
Corrected license info

12 years agoAdding missing license info
Artur Signell [Thu, 2 Feb 2012 16:11:23 +0000 (18:11 +0200)]
Adding missing license info

12 years agoRemoved debug info
Artur Signell [Thu, 2 Feb 2012 16:03:48 +0000 (16:03 +0000)]
Removed debug info

svn changeset:22867/svn branch:6.7

12 years agoFixed #8321: adding/removing items in a ComboBox FocusListener breaks the dropdown...
Johannes Dahlström [Thu, 2 Feb 2012 15:30:15 +0000 (15:30 +0000)]
Fixed #8321: adding/removing items in a ComboBox FocusListener breaks the dropdown list.

Clicking the dropdown button on an unfocused ComboBox would send a separate options request and a focus event request. The responses would confuse the rendering logic. The changes are now sent in a single variable burst.

svn changeset:22863/svn branch:6.7

12 years ago[merge from 6.7] Fixed #8315 - take leap years into account in focusNext/PreviousYear
Johannes Dahlström [Thu, 2 Feb 2012 15:51:49 +0000 (15:51 +0000)]
[merge from 6.7] Fixed #8315 - take leap years into account in focusNext/PreviousYear

svn changeset:22864/svn branch:6.8

12 years ago#8311 Extended test to cover non-java files
Artur Signell [Thu, 2 Feb 2012 15:23:26 +0000 (15:23 +0000)]
#8311 Extended test to cover non-java files

svn changeset:22862/svn branch:6.7

12 years agoFixed #8315 - take leap years into account in focusNext/PreviousYear
Johannes Dahlström [Thu, 2 Feb 2012 13:51:11 +0000 (13:51 +0000)]
Fixed #8315 - take leap years into account in focusNext/PreviousYear

svn changeset:22857/svn branch:6.7

12 years ago#6718 displayedMonth and focusedDate must have zeroed hours/min/sec/msec
Johannes Dahlström [Thu, 2 Feb 2012 14:48:21 +0000 (14:48 +0000)]
#6718 displayedMonth and focusedDate must have zeroed hours/min/sec/msec

svn changeset:22859/svn branch:6.8

12 years agoRemoved unnecessary getWidgetForPaintable methods
Artur Signell [Thu, 2 Feb 2012 10:20:02 +0000 (12:20 +0200)]
Removed unnecessary getWidgetForPaintable methods

12 years agoAbort if merge fails
Artur Signell [Thu, 2 Feb 2012 10:15:50 +0000 (10:15 +0000)]
Abort if merge fails

svn changeset:22856/svn branch:6.8

12 years agoFixed ClassCastException for VWindow
Artur Signell [Thu, 2 Feb 2012 09:30:47 +0000 (11:30 +0200)]
Fixed ClassCastException for VWindow

12 years ago[merge from 6.7] #8311 Converted CRLF -> LF in css/html/xml files
Automerge [Thu, 2 Feb 2012 09:29:04 +0000 (09:29 +0000)]
[merge from 6.7] #8311 Converted CRLF -> LF in css/html/xml files

svn changeset:22853/svn branch:6.8

12 years ago#8311 Converted CRLF -> LF in css/html/xml files
Artur Signell [Thu, 2 Feb 2012 09:20:29 +0000 (09:20 +0000)]
#8311 Converted CRLF -> LF in css/html/xml files

svn changeset:22852/svn branch:6.7

12 years agoOptionally read password from file
Artur Signell [Thu, 2 Feb 2012 08:22:32 +0000 (08:22 +0000)]
Optionally read password from file

svn changeset:22850/svn branch:6.8

12 years agoFixed ClassCastException as VViewPaintable should be created, not VView
Artur Signell [Thu, 2 Feb 2012 08:02:28 +0000 (10:02 +0200)]
Fixed ClassCastException as VViewPaintable should be created, not VView

12 years agoTest case for #8321
Johannes Dahlström [Wed, 1 Feb 2012 12:54:37 +0000 (12:54 +0000)]
Test case for #8321

svn changeset:22849/svn branch:6.7

12 years agoFixed problem introduced in merge from 6.8
Artur Signell [Tue, 31 Jan 2012 17:00:26 +0000 (19:00 +0200)]
Fixed problem introduced in merge from 6.8

12 years agoMerge remote-tracking branch 'origin/6.8'
Artur Signell [Tue, 31 Jan 2012 16:55:40 +0000 (18:55 +0200)]
Merge remote-tracking branch 'origin/6.8'

Conflicts:
WebContent/release-notes.html

12 years agoMerge commit '116cd1f29a432fe5ca64f3023a9fec1ca130f078' (origin/6.8)
Artur Signell [Tue, 31 Jan 2012 16:49:57 +0000 (18:49 +0200)]
Merge commit '116cd1f29a432fe5ca64f3023a9fec1ca130f078' (origin/6.8)

Manually merged CRLF changes + additional small patch for changes that SHOULD NOT be in the changeset but that the SVN -> GIT sync script has added