diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-05-21 16:57:10 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-05-21 16:57:10 +0200 |
| commit | 30bbcbb75063386c6609a75337aad59ce95dbd73 (patch) | |
| tree | 4c87344232f50441960bcb30c359dc3e591e8eb4 /VERSION | |
| parent | d5eea102ff343804dde1ccd254bc570596341a89 (diff) | |
| parent | b68b7d4d4902dd844d5ebb8e0afc0165f134f5e2 (diff) | |
Merge branch 'development' into test
Diffstat (limited to 'VERSION')
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -1.5.3 +1.5.4 |