diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-05-13 13:43:37 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-05-13 13:43:37 +0200 |
| commit | 69be9601ac8fcff7a4afda93d8d32035ec1877e4 (patch) | |
| tree | 81946beb76e20819548e842787cdb9d7033b381e /etc/version | |
| parent | cd9fa56b5729da52f0dfd116e782906d6bd85555 (diff) | |
| parent | 042578fd634f8c54a158417527d018e0f8f56b95 (diff) | |
| download | pfsense-69be9601ac8fcff7a4afda93d8d32035ec1877e4.zip pfsense-69be9601ac8fcff7a4afda93d8d32035ec1877e4.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/vslb.inc
etc/version
Diffstat (limited to 'etc/version')
| -rw-r--r-- | etc/version | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/version b/etc/version index e252e34..5134f7e 100644 --- a/etc/version +++ b/etc/version @@ -1 +1 @@ -2.0-RC1-IPv6 +2.0-RC2-IPv6 |
