diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-21 08:12:12 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-21 08:12:12 -0400 |
| commit | c7bb0eeda4498e9310a5e2b765947f876afddf72 (patch) | |
| tree | 8395e4a5b60dff7a2a3a576ddeb39ce8eb09a2e6 /etc/version | |
| parent | ffdcbeb67b3b8bea0e381e9d969fb4743eff7754 (diff) | |
| parent | 7cca77de28652ca92a901be6da2e8ad86259ce16 (diff) | |
| download | pfsense-c7bb0eeda4498e9310a5e2b765947f876afddf72.zip pfsense-c7bb0eeda4498e9310a5e2b765947f876afddf72.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
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 5134f7e..064823b 100644 --- a/etc/version +++ b/etc/version @@ -1 +1 @@ -2.0-RC2-IPv6 +2.0-RC3-IPv6 |
