Merge branch 'master' of https://github.com/tqchen/xgboost

R-package/DESCRIPTION

@@ -6,7 +6,7 @@ Date: 2014-08-23
 Author: Tianqi Chen, Tong He
 Maintainer: Tianqi Chen <tianqi.tchen@gmail.com>, Tong He <hetong007@gmail.com>
 Description: xgboost
-License: See LICENSE file
+License: See LICENSE file in the project root of xgboost.
 URL: https://github.com/tqchen/xgboost
 BugReports: https://github.com/tqchen/xgboost/issues
 Depends:

R-package/LICENSE

@@ -1,13 +0,0 @@
-Copyright (c) 2014 by Tianqi Chen and Contributors 
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

README.md

@@ -28,9 +28,8 @@ Build
 * You may get a error: -lgomp is not found
   - You can type ```make no_omp=1```, this will get you single thread xgboost
   - Alternatively, you can upgrade your compiler to compile multi-thread version
-* Possible way to build using Visual Studio (not tested):
-  - In principle, you can put src/xgboost.cpp and src/io/io.cpp into the project, and build xgboost.
-  - For python module, you need python/xgboost_wrapper.cpp and src/io/io.cpp to build a dll.
+* Windows(VS 2010): see [windows](windows) folder
+  - In principle, you put all the cpp files in the Makefile to the project, and build
 
 Version
 ======

wrapper/README.md

@@ -10,4 +10,4 @@ Python
 
 R 
 =====
-* See ../R-package
+* See [R-package](../R-package)