Merge pull request #2151 from haneefmubarak/cleanup

cleanup series I - part I

11 files changed, 41 insertions, 36 deletions

diff --git a/CONTRIBUTING.markdown b/CONTRIBUTING.md
index ceea8735..c068eb7f 100644
--- a/CONTRIBUTING.markdown
+++ b/CONTRIBUTING.md
@@ -1,5 +1,6 @@
+Contributing
+============
 
 See our wiki for information about contributing to Emscripten:
 
 [Contribution section on wiki](https://github.com/kripken/emscripten/wiki#contributing)
-
diff --git a/README.markdown b/README.markdown
deleted file mode 100644
index 81a95141..00000000
--- a/README.markdown
+++ /dev/null
@@ -1,14 +0,0 @@
-
-![logo](http://dl.dropbox.com/u/80664946/emscripten_logo.jpg)
-
-Emscripten
-==========
-
-Emscripten is an LLVM-to-JavaScript compiler. It takes LLVM bitcode - which can be generated from C/C++, using llvm-gcc or clang, or any other language that can be converted into LLVM - and compiles that into JavaScript, which can be run on the web (or anywhere else JavaScript can run).
-
-Links to **demos**, **tutorial**, **FAQ**, etc: <https://github.com/kripken/emscripten/wiki>
-
-Main project page: <http://emscripten.org>
-
-Emscripten is MIT licensed, see LICENSE.txt.
-
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..6b4778bf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+![emscripten logo](media/switch_logo.jpeg)
+
+Emscripten is an LLVM-to-JavaScript compiler. It takes LLVM bitcode - which can be generated
+from C/C++, using `llvm-gcc` (DragonEgg) or `clang`, or any other language that can be
+converted into LLVM - and compiles that into JavaScript, which can be run on the web (or
+anywhere else JavaScript can run).
+
+Links to **demos**, **tutorial**, **FAQ**, etc: <https://github.com/kripken/emscripten/wiki>
+
+Main project page: <http://emscripten.org>
+
+License
+-------
+
+Emscripten is available under 2 licenses, the MIT license and the
+University of Illinois/NCSA Open Source License.
+
+Both are permissive open source licenses, with little if any
+practical difference between them.
+
+The reason for offering both is that (1) the MIT license is
+well-known, while (2) the University of Illinois/NCSA Open Source
+License allows Emscripten's code to be integrated upstream into
+LLVM, which uses that license, should the opportunity arise.
+
+See `LICENSE` for the full content of the licenses.
diff --git a/docs/emscripten_switch_logo.eps b/media/switch_logo.eps
index 741970c1..741970c1 100644
--- a/docs/emscripten_switch_logo.eps
+++ b/media/switch_logo.eps
diff --git a/docs/emscripten_switch_logo.jpg b/media/switch_logo.jpeg
index 7c05cd94..7c05cd94 100644
--- a/docs/emscripten_switch_logo.jpg
+++ b/media/switch_logo.jpeg
diff --git a/docs/emscripten_switch_logo.svg b/media/switch_logo.svg
index 58277388..58277388 100644
--- a/docs/emscripten_switch_logo.svg
+++ b/media/switch_logo.svg
diff --git a/package.json b/package.json
index a1447c9f..130dff69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "emscripten",
-  "version": "1.0.0",
+  "version": "1.12.0",
   "dependencies": {
     "ws": "~0.4.28"
   }
diff --git a/patches/README b/patches/README
deleted file mode 100644
index f6817fed..00000000
--- a/patches/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains a useful mercurial patch queue.
-
-Note to patch queue maintainer: You need to manually copy from .hg/patches into this directory, after |qrefresh|ing the patch.
-
diff --git a/patches/series b/patches/series
deleted file mode 100644
index 04f16d03..00000000
--- a/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-sauer
-
diff --git a/src/relooper/README.markdown b/src/relooper/README.markdown
deleted file mode 100644
index 9b0187b3..00000000
--- a/src/relooper/README.markdown
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Relooper
-========
-
-This is an optimized C++ implemention of the Relooper algorithm originally
-developed as part of Emscripten. This implementation includes optimizations
-added since the original academic paper [1] - see paper.pdf - was published
-about it, and is written in an LLVM-friendly way with the goal of inclusion
-in upstream LLVM.
-
-License: MIT&LLVM
-
-[1] Alon Zakai. 2011. Emscripten: an LLVM-to-JavaScript compiler. In Proceedings of the ACM international conference companion on Object oriented programming systems languages and applications companion (SPLASH '11). ACM, New York, NY, USA, 301-312. DOI=10.1145/2048147.2048224 http://doi.acm.org/10.1145/2048147.2048224
-
diff --git a/src/relooper/README.md b/src/relooper/README.md
new file mode 100644
index 00000000..a4073a77
--- /dev/null
+++ b/src/relooper/README.md
@@ -0,0 +1,12 @@
+Relooper
+========
+
+This is an optimized C++ implemention of the Relooper algorithm originally developed as part
+of Emscripten. This implementation includes optimizations added since the original academic
+paper [1] - see paper.pdf - was published about it, and is written in an LLVM-friendly way
+with the goal of inclusion in upstream LLVM.
+
+[1] Alon Zakai. 2011. Emscripten: an LLVM-to-JavaScript compiler. In Proceedings of the ACM
+international conference companion on Object oriented programming systems languages and
+applications companion (SPLASH '11). ACM, New York, NY, USA, 301-312.
+DOI=10.1145/2048147.2048224 http://doi.acm.org/10.1145/2048147.2048224