*Merge.

--HG--
branch : trunk

1 files changed, 17 insertions, 17 deletions

diff --git a/dep/include/openssl/opensslv.h b/dep/include/openssl/opensslv.h
index 8a5b34e4f07..fb9072ec8b1 100644
--- a/dep/include/openssl/opensslv.h
+++ b/dep/include/openssl/opensslv.h
@@ -6,14 +6,14 @@
  * The status nibble has one of the values 0 for development, 1 to e for betas
  * 1 to 14, and f for release.  The patch level is exactly that.
  * For example:
- * 0.9.3-dev	  0x00903000
- * 0.9.3-beta1	  0x00903001
+ * 0.9.3-dev      0x00903000
+ * 0.9.3-beta1    0x00903001
  * 0.9.3-beta2-dev 0x00903002
  * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)
- * 0.9.3	  0x0090300f
- * 0.9.3a	  0x0090301f
- * 0.9.4	  0x0090400f
- * 1.2.3z	  0x102031af
+ * 0.9.3      0x0090300f
+ * 0.9.3a     0x0090301f
+ * 0.9.4      0x0090400f
+ * 1.2.3z     0x102031af
  *
  * For continuity reasons (because 0.9.5 is already out, and is coded
  * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
@@ -25,13 +25,13 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x0090805fL
+#define OPENSSL_VERSION_NUMBER  0x0090805fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8e-fips 23 Feb 2007"
+#define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8e-fips 23 Feb 2007"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8e 23 Feb 2007"
+#define OPENSSL_VERSION_TEXT    "OpenSSL 0.9.8e 23 Feb 2007"
 #endif
-#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
+#define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
 
 /* The macros below are to be used for shared library (.so, .dll, ...)
@@ -42,11 +42,11 @@
  * be greater or equal to what it was at application link time.  With this
  * scheme, the version number is usually part of the file name, like this:
  *
- *	libcrypto.so.0.9
+ *  libcrypto.so.0.9
  *
  * Some unixen also make a softlink with the major verson number only:
  *
- *	libcrypto.so.0
+ *  libcrypto.so.0
  *
  * On Tru64 and IRIX 6.x it works a little bit differently.  There, the
  * shared library version is stored in the file, and is actually a series
@@ -61,11 +61,11 @@
  * to highest, should be part of the string.  Consecutive builds would
  * give the following versions strings:
  *
- *	3.0
- *	3.0:3.1
- *	3.0:3.1:3.2
- *	4.0
- *	4.0:4.1
+ *  3.0
+ *  3.0:3.1
+ *  3.0:3.1:3.2
+ *  4.0
+ *  4.0:4.1
  *
  * Notice how version 4 is completely incompatible with version, and
  * therefore give the breach you can see.