]> source.dussan.org Git - vaadin-framework.git/commit
projects / vaadin-framework.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a5b079d 915c37b)
Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into master
authorJonatan Kronqvist <jonatan@vaadin.com>
Mon, 10 Feb 2014 11:14:12 +0000 (13:14 +0200)
committerJonatan Kronqvist <jonatan@vaadin.com>
Mon, 10 Feb 2014 11:14:12 +0000 (13:14 +0200)
commit4f4ac0276b999d22a6e6b57d6073d6a643dd8c66
treeafcb8307b5739fbf66c82117a7af29dc564c0481tree | snapshot
parenta5b079d1defa45b790a183bbc63dd1154ec0168ccommit | diff
parent915c37b569600a8d37db2a0800a30474da49e255commit | diff
Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into master

915c37b Sass compiler now treats null-valued variables as unassigned (#12430).

Conflicts:
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: If9789f8d0638377d27e77ec4be0fdf0f96e4b1af
theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java diff1 | diff2 | blob | history
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java diff1 | diff2 | blob | history
theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj diff1 | diff2 | blob | history
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework