Merge branch 'master' of github.com:EiffelWebFramework/EWF
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,12 +1,12 @@
|
|||||||
[submodule "doc/wiki"]
|
[submodule "doc/wiki"]
|
||||||
path = doc/wiki
|
path = doc/wiki
|
||||||
url = https://github.com/Eiffel-World/Eiffel-Web-Framework.wiki.git
|
url = https://github.com/EiffelWebFramework/EWF.wiki.git
|
||||||
[submodule "contrib/library/server/nino"]
|
[submodule "contrib/library/server/nino"]
|
||||||
path = contrib/library/server/nino
|
path = contrib/library/server/nino
|
||||||
url = https://github.com/Eiffel-World/EiffelWebNino.git
|
url = https://github.com/Eiffel-World/EiffelWebNino.git
|
||||||
[submodule "contrib/library/text/parser/json"]
|
[submodule "contrib/library/text/parser/json"]
|
||||||
path = contrib/library/text/parser/json
|
path = contrib/library/text/parser/json
|
||||||
url = https://github.com/Eiffel-World/ejson-svn.git
|
url = https://github.com/Eiffel-World/json.git
|
||||||
[submodule "contrib/ise_library/cURL"]
|
[submodule "contrib/ise_library/cURL"]
|
||||||
path = contrib/ise_library/cURL
|
path = contrib/ise_library/cURL
|
||||||
url = https://github.com/EiffelSoftware/mirror-Eiffel-cURL.git
|
url = https://github.com/EiffelSoftware/mirror-Eiffel-cURL.git
|
||||||
|
|||||||
10
README.md
10
README.md
@@ -5,11 +5,11 @@
|
|||||||
|
|
||||||
Official project site for Eiffel Web Framework:
|
Official project site for Eiffel Web Framework:
|
||||||
|
|
||||||
* http://eiffel-world.github.com/Eiffel-Web-Framework/
|
* http://eiffelwebframework.github.com/EWF/
|
||||||
|
|
||||||
For more information please have a look at the related wiki:
|
For more information please have a look at the related wiki:
|
||||||
|
|
||||||
* https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
|
* https://github.com/EiffelWebFramework/EWF/wiki
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
@@ -20,10 +20,10 @@ For more information please have a look at the related wiki:
|
|||||||
## How to get the source code?
|
## How to get the source code?
|
||||||
|
|
||||||
Using git version >= 1.6.5
|
Using git version >= 1.6.5
|
||||||
* git clone --recursive https://github.com/Eiffel-World/Eiffel-Web-Framework.git
|
* git clone --recursive https://github.com/EiffelWebFramework/EWF.git
|
||||||
|
|
||||||
Otherwise, try
|
Otherwise, try
|
||||||
* git clone https://github.com/Eiffel-World/Eiffel-Web-Framework.git
|
* git clone https://github.com/EiffelWebFramework/EWF.git
|
||||||
* cd Eiffel-Web-Framework
|
* cd Eiffel-Web-Framework
|
||||||
* git submodule update --init
|
* git submodule update --init
|
||||||
* git submodule foreach --recursive git checkout master
|
* git submodule foreach --recursive git checkout master
|
||||||
@@ -77,4 +77,4 @@ An alternative to the last 2 instructions is to use the script from tools folder
|
|||||||
|
|
||||||
|
|
||||||
For more information please have a look at the related wiki:
|
For more information please have a look at the related wiki:
|
||||||
* https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
|
* https://github.com/EiffelWebFramework/EWF/wiki
|
||||||
|
|||||||
Submodule contrib/library/text/parser/json updated: 769bb7d161...c873d62efa
Reference in New Issue
Block a user