diff options
| author | Tobias Matt <t.matt81+github@gmail.com> | 2016-05-13 10:08:29 +0200 |
|---|---|---|
| committer | Tobias Matt <t.matt81+github@gmail.com> | 2016-05-13 10:08:29 +0200 |
| commit | 65645fb8cad05307b9faf9a897eefd5ae8c46dad (patch) | |
| tree | c522c0cd320c4930b7532d892c0831b148c98e93 | |
| parent | 4122ad3f7b0e0dc1083a54b51430c8d7207d74ef (diff) | |
| parent | 69f05e1afd2e046938209e00db62d18efead4932 (diff) | |
Merge remote-tracking branch 'upstream/master'
134 files changed, 23952 insertions, 10271 deletions
diff --git a/.gitignore b/.gitignore index 8b8c45169d..a082ea22e4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,8 @@ build/ .vagrant/ .DS_STORE -# Eclipse Settings +# Eclipse/PyCharm/Other IDE Settings .cproject .project .settings/ - +.idea diff --git a/BUILD_GUIDE.md b/BUILD_GUIDE.md index f7a57d2fc9..fd8b6202ff 100644 --- a/ |