]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
12 years agoRemove all margins from the combo box input field (#8313)
Leif Åstrand [Fri, 17 Feb 2012 11:10:07 +0000 (13:10 +0200)]
Remove all margins from the combo box input field (#8313)

12 years agoAvoid captions wrapping over multiple rows (#8313)
Leif Åstrand [Fri, 17 Feb 2012 10:59:41 +0000 (12:59 +0200)]
Avoid captions wrapping over multiple rows (#8313)

12 years agoUpdate to simulate captions in ChildComponentContainer (#8313)
Leif Åstrand [Fri, 17 Feb 2012 10:52:50 +0000 (12:52 +0200)]
Update to simulate captions in ChildComponentContainer (#8313)

12 years agoSet a style name for the layout slot and add overflow: hidden (#8313)
Leif Åstrand [Thu, 16 Feb 2012 16:58:15 +0000 (18:58 +0200)]
Set a style name for the layout slot and add overflow: hidden (#8313)

12 years agoSupport captions placed after the component (#8313)
Leif Åstrand [Thu, 16 Feb 2012 16:48:31 +0000 (18:48 +0200)]
Support captions placed after the component (#8313)

12 years agoOnly use explicit 24px for text field paintables (#8313)
Leif Åstrand [Thu, 16 Feb 2012 15:30:52 +0000 (17:30 +0200)]
Only use explicit 24px for text field paintables (#8313)

12 years agoUpdate MenuBar to work with MeasureManager (#8313)
Leif Åstrand [Thu, 16 Feb 2012 10:25:51 +0000 (12:25 +0200)]
Update MenuBar to work with MeasureManager (#8313)

12 years agoMake VFilterSelect work with border-box & MeasureManager (#8313)
Leif Åstrand [Thu, 16 Feb 2012 10:14:30 +0000 (12:14 +0200)]
Make VFilterSelect work with border-box & MeasureManager (#8313)

12 years agoUse required size instead of offset size (#8313)
Leif Åstrand [Thu, 16 Feb 2012 08:04:00 +0000 (10:04 +0200)]
Use required size instead of offset size (#8313)

Consistency with 6.x is otherwise broken in some cases where the
bounding rectangle gets rounded

12 years agoMake GridLayout react to caption size changes (#8313)
Leif Åstrand [Thu, 16 Feb 2012 07:21:51 +0000 (09:21 +0200)]
Make GridLayout react to caption size changes (#8313)

12 years agoMerge branch 'master' into layoutperformance
Leif Åstrand [Wed, 15 Feb 2012 16:12:19 +0000 (18:12 +0200)]
Merge branch 'master' into layoutperformance

12 years agoMerge remote branch 'origin/6.8'
Leif Åstrand [Wed, 15 Feb 2012 16:11:57 +0000 (18:11 +0200)]
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java

12 years agoSimulate ChildComponentContainer in the new OrderedLayouts (#8313)
Leif Åstrand [Wed, 15 Feb 2012 16:06:16 +0000 (18:06 +0200)]
Simulate ChildComponentContainer in the new OrderedLayouts (#8313)

12 years ago[merge from 6.7] Set explicit resolution to make screenshot merging easier
Automerge [Wed, 15 Feb 2012 15:19:14 +0000 (15:19 +0000)]
[merge from 6.7] Set explicit resolution to make screenshot merging easier

svn changeset:23037/svn branch:6.8

12 years ago[merge from 6.7] Add some labels and a little spacing to spice things up
Automerge [Wed, 15 Feb 2012 15:19:09 +0000 (15:19 +0000)]
[merge from 6.7] Add some labels and a little spacing to spice things up

svn changeset:23036/svn branch:6.8

12 years ago[merge from 6.7] #4353 ComboBox.removeAllItems did not remove selected icon: addition...
Automerge [Wed, 15 Feb 2012 14:16:52 +0000 (14:16 +0000)]
[merge from 6.7] #4353 ComboBox.removeAllItems did not remove selected icon: additional fix to avoid changing undefined width combobox initial width

svn changeset:23031/svn branch:6.8

12 years ago[merge from 6.7] #4353 ComboBox.removeAllItems did not remove selected icon
Automerge [Wed, 15 Feb 2012 14:16:44 +0000 (14:16 +0000)]
[merge from 6.7] #4353 ComboBox.removeAllItems did not remove selected icon

svn changeset:23030/svn branch:6.8

12 years agoMerge branch 'master' into layoutperformance
Leif Åstrand [Wed, 15 Feb 2012 13:48:20 +0000 (15:48 +0200)]
Merge branch 'master' into layoutperformance

12 years agoMerge remote-tracking branch 'origin/6.8'
Leif Åstrand [Wed, 15 Feb 2012 13:32:09 +0000 (15:32 +0200)]
Merge remote-tracking branch 'origin/6.8'

12 years ago[merge from 6.7] #8114 Cleaned up fix
Automerge [Wed, 15 Feb 2012 10:06:48 +0000 (10:06 +0000)]
[merge from 6.7] #8114 Cleaned up fix

svn changeset:23026/svn branch:6.8

12 years agoFix typo in browser version name
Leif Åstrand [Wed, 15 Feb 2012 08:42:31 +0000 (10:42 +0200)]
Fix typo in browser version name

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

12 years agoMerge remote branch 'origin/6.8'
Leif Åstrand [Wed, 15 Feb 2012 07:31:53 +0000 (09:31 +0200)]
Merge remote branch 'origin/6.8'

12 years agoRevert "Continue testing with Chrome 16 until new screenshots are merged"
Leif Åstrand [Wed, 15 Feb 2012 07:30:55 +0000 (09:30 +0200)]
Revert "Continue testing with Chrome 16 until new screenshots are merged"

This reverts commit cd92d6d59eadd2e52899505e5e269513d78a03c2.

12 years ago[merge from 6.7] #8114 - Fixed TabSheet rendering of first tab when another tab is...
Automerge [Wed, 15 Feb 2012 02:18:50 +0000 (02:18 +0000)]
[merge from 6.7] #8114 - Fixed TabSheet rendering of first tab when another tab is selected

svn changeset:23014/svn branch:6.8

12 years ago[merge from 6.7] #8373 Handler DragAndDropService changeVariables error by finding...
Automerge [Wed, 15 Feb 2012 02:18:42 +0000 (02:18 +0000)]
[merge from 6.7] #8373 Handler DragAndDropService changeVariables error by finding the drop target and using that for error reporting

svn changeset:23013/svn branch:6.8

12 years ago[merge from 6.7] #8392 Improved error message for exceptions that take place in liste...
Automerge [Tue, 14 Feb 2012 22:08:42 +0000 (22:08 +0000)]
[merge from 6.7] #8392 Improved error message for exceptions that take place in listener code

svn changeset:23006/svn branch:6.8

12 years agoVScrollTable that works with the MeasureManager (#8313)
Leif Åstrand [Tue, 14 Feb 2012 14:34:12 +0000 (16:34 +0200)]
VScrollTable that works with the MeasureManager (#8313)

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 ago[merge from 6.7] #5833 and #7013 combo box width fix and tests
Automerge [Tue, 14 Feb 2012 14:06:37 +0000 (14:06 +0000)]
[merge from 6.7] #5833 and #7013 combo box width fix and tests

svn changeset:23000/svn branch:6.8

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 agoContinue testing with Chrome 16 until new screenshots are merged
Leif Åstrand [Tue, 14 Feb 2012 10:52:45 +0000 (12:52 +0200)]
Continue testing with Chrome 16 until new screenshots are merged

12 years agoMerge remote branch 'origin/6.8'
Leif Åstrand [Tue, 14 Feb 2012 10:48:07 +0000 (12:48 +0200)]
Merge remote branch 'origin/6.8'

Conflicts:
WebContent/release-notes.html
tests/test.xml
tests/testbench/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java

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 ago[merge from 6.7] #8264 fix long range selection in multi-selectable table, related...
Automerge [Mon, 13 Feb 2012 14:14:37 +0000 (14:14 +0000)]
[merge from 6.7] #8264 fix long range selection in multi-selectable table, related test

svn changeset:22984/svn branch:6.8

12 years ago[merge from 6.7] #8240 Chrome 17 on a desktop was detected as a touch device
Automerge [Mon, 13 Feb 2012 14:14:29 +0000 (14:14 +0000)]
[merge from 6.7] #8240 Chrome 17 on a desktop was detected as a touch device

svn changeset:22983/svn branch:6.8

12 years ago[merge from 6.7] #8362 Ensure value is not toggled when checkbox is disabled
Automerge [Mon, 13 Feb 2012 09:45:38 +0000 (09:45 +0000)]
[merge from 6.7] #8362 Ensure value is not toggled when checkbox is disabled

svn changeset:22978/svn branch:6.8

12 years ago[merge from 6.7] Update test.xml to use Chrome 17
Automerge [Mon, 13 Feb 2012 09:45:33 +0000 (09:45 +0000)]
[merge from 6.7] Update test.xml to use Chrome 17

svn changeset:22977/svn branch:6.8

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 ago[merge from 6.7] Ensure that all opened FileInputStreams are closed
Artur Signell [Tue, 7 Feb 2012 11:51:48 +0000 (11:51 +0000)]
[merge from 6.7] Ensure that all opened FileInputStreams are closed

svn changeset:22944/svn branch:6.8

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 ago#8216 Fixed widgetset compilation warning
Artur Signell [Mon, 6 Feb 2012 14:37:21 +0000 (14:37 +0000)]
#8216 Fixed widgetset compilation warning

svn changeset:22936/svn branch:6.8

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 ago[merge from 6.7] Fixed resolution to sec for easier merges to 7.0
Artur Signell [Mon, 6 Feb 2012 13:42:51 +0000 (13:42 +0000)]
[merge from 6.7] Fixed resolution to sec for easier merges to 7.0

svn changeset:22934/svn branch:6.8

12 years ago[merge from 6.7] Set resolution to second to make test consistent in Vaadin 6 and...
Artur Signell [Mon, 6 Feb 2012 12:51:23 +0000 (12:51 +0000)]
[merge from 6.7] Set resolution to second to make test consistent in Vaadin 6 and Vaadin 7

svn changeset:22929/svn branch:6.8

12 years ago[merge from 6.7] #8284, #8336 Removed dead code
Artur Signell [Mon, 6 Feb 2012 12:51:06 +0000 (12:51 +0000)]
[merge from 6.7] #8284, #8336 Removed dead code

svn changeset:22928/svn branch:6.8

12 years ago[merge from 6.7] Updated changelog in Release Notes for Vaadin 6.7.5. Fixes #8348.
Artur Signell [Mon, 6 Feb 2012 12:50:47 +0000 (12:50 +0000)]
[merge from 6.7] Updated changelog in Release Notes for Vaadin 6.7.5. Fixes #8348.

svn changeset:22927/svn branch:6.8

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'