diff options
| author | Marko Grönroos <magi@iki.fi> | 2008-04-25 15:42:07 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2008-04-25 15:42:07 +0000 |
| commit | 9a367dfdc2c83770a711a5487898fc7b91af84e6 (patch) | |
| tree | 734fe275f9486e1858d0a2df047baf564462b7fb /build/VERSION.properties | |
| parent | 6c71b4e1831b4181fbc2a7362ae0178bf96c80ea (diff) | |
| download | vaadin-framework-9a367dfdc2c83770a711a5487898fc7b91af84e6.tar.gz vaadin-framework-9a367dfdc2c83770a711a5487898fc7b91af84e6.zip | |
Merged 5.1.2 release branch (4247:4249) back to trunk. The fix for reservr.html in 5.1.2 branch conflicted with trunk, resolved in favour of trunk.
svn changeset:4251/svn branch:trunk
Diffstat (limited to 'build/VERSION.properties')
| -rw-r--r-- | build/VERSION.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/VERSION.properties b/build/VERSION.properties index 0e24ef5838..367418b5c4 100644 --- a/build/VERSION.properties +++ b/build/VERSION.properties @@ -1 +1 @@ -version=5.1.0
\ No newline at end of file +version=5.1.2 |