Merge branch 'master' into 816

1 files changed, 0 insertions, 17 deletions

diff --git a/other-licenses/7zstub/src/Common/Random.cpp b/other-licenses/7zstub/src/Common/Random.cpp
deleted file mode 100644
index 85d275c23..000000000
--- a/other-licenses/7zstub/src/Common/Random.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Common/Random.cpp

-

-#include "StdAfx.h"

-

-#include <time.h>

-#include <stdlib.h>

-

-#include "Common/Random.h"

-

-void CRandom::Init(unsigned int seed)

-  { srand(seed); }

-

-void CRandom::Init()

-  { Init((unsigned int)time(NULL)); }

-

-int CRandom::Generate() const

-  { return rand(); }