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 /usr/local/www/themes/metallic/images/wizards | |
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 'usr/local/www/themes/metallic/images/wizards')
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/joincluster.gif | bin | 10076 -> 10076 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/joincluster_mo.gif | bin | 10153 -> 10153 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/restore.gif | bin | 9199 -> 9199 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/restore_mo.gif | bin | 9099 -> 9099 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/standalone.gif | bin | 7265 -> 7265 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/standalone_mo.gif | bin | 7382 -> 7382 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/startnewcluster.gif | bin | 10175 -> 10175 bytes |
-rwxr-xr-x[-rw-r--r--] | usr/local/www/themes/metallic/images/wizards/initial/startnewcluster_mo.gif | bin | 10030 -> 10030 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/usr/local/www/themes/metallic/images/wizards/initial/joincluster.gif b/usr/local/www/themes/metallic/images/wizards/initial/joincluster.gif Binary files differindex a6f90a2..a6f90a2 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/joincluster.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/joincluster.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/joincluster_mo.gif b/usr/local/www/themes/metallic/images/wizards/initial/joincluster_mo.gif Binary files differindex 3787d69..3787d69 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/joincluster_mo.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/joincluster_mo.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/restore.gif b/usr/local/www/themes/metallic/images/wizards/initial/restore.gif Binary files differindex eb8931f..eb8931f 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/restore.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/restore.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/restore_mo.gif b/usr/local/www/themes/metallic/images/wizards/initial/restore_mo.gif Binary files differindex 2ee46c7..2ee46c7 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/restore_mo.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/restore_mo.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/standalone.gif b/usr/local/www/themes/metallic/images/wizards/initial/standalone.gif Binary files differindex aa035a4..aa035a4 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/standalone.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/standalone.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/standalone_mo.gif b/usr/local/www/themes/metallic/images/wizards/initial/standalone_mo.gif Binary files differindex c8066ef..c8066ef 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/standalone_mo.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/standalone_mo.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster.gif b/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster.gif Binary files differindex dbe0ca2..dbe0ca2 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster.gif diff --git a/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster_mo.gif b/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster_mo.gif Binary files differindex 83d980a..83d980a 100644..100755 --- a/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster_mo.gif +++ b/usr/local/www/themes/metallic/images/wizards/initial/startnewcluster_mo.gif |