Rohan Rathi 190d1b2f7a Fixed merge errors

2018-07-03 19:01:20 +05:30

build_files

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00

doc

Merge branch 'master' into blender2.8

2018-06-26 22:56:39 +02:00

extern

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00

intern

Merge branch 'master' into blender2.8

2018-07-02 18:18:16 +02:00

release

Merge branch 'blender2.8' into soc-2018-bevel

2018-07-02 23:31:19 +05:30

source

Fixed merge errors

2018-07-03 19:01:20 +05:30

tests

Merge branch 'master' into blender2.8

2018-06-29 08:05:38 +02:00

.arcconfig

Arc: Use proper lacding branch

2018-04-24 12:26:37 +02:00

.editorconfig

editorconfig: correct C/C++ using space

2018-06-19 07:48:12 +02:00

.gitignore

Build: add scripts to build dependencies for Windows and macOS.

2017-08-07 17:46:06 +02:00

.gitmodules

Fix git submodules branch configuration

2018-04-23 12:55:04 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-06-28 10:50:04 +02:00

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

Merge remote-tracking branch 'origin/master' into blender2.8

2018-04-25 09:31:25 +02:00

make.bat

Cleanup: trailing space cmake, make.bat

2018-06-17 20:18:09 +02:00

Description

No description provided

841 MiB

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%