diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-09-25 23:33:58 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-09-25 23:33:58 +0300 |
| commit | 7c1f329f286f464c77f970204a3b617ce6e56086 (patch) | |
| tree | c3d991a51e699ad764fcafd6773f239c494370ff /GNUmakefile | |
| parent | 77d809cd6b6f306c7c355ee3cf27aa20d4816b9b (diff) | |
| parent | 02b789642310f55845ef4e7facc7c2659815bb25 (diff) | |
Merge branch 'master' into wiggly-widgets
Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 3c2ab9d51b9..c73aaa7bfbb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -122,7 +122,7 @@ endif # Build Blender all: FORCE @echo - @echo Configuring Blender ... + @echo Configuring Blender in \"$(BUILD_DIR)\" ... # # if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ # # $(CMAKE_CONFIG); \ |