Merge branch 'develop'

This commit is contained in:
Peter Dimov
2014-06-05 18:54:25 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,10 +1,9 @@
# Copyright Rene Rivera 2011 # Copyright Rene Rivera 2014
# Distributed under the Boost Software License, Version 1.0. # Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at # (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt) # http://www.boost.org/LICENSE_1_0.txt)
project predef project predef
: build-dir bin
; ;
path-constant BOOST_PREDEF_ROOT : . ; path-constant BOOST_PREDEF_ROOT : . ;

1
test/.gitignore vendored
View File

@@ -1,2 +1,3 @@
/defs-clang.txt /defs-clang.txt
/defs-gcc.txt /defs-gcc.txt
/bin/