diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/readblenfile | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/readblenfile')
| -rw-r--r-- | source/blender/readblenfile/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/readblenfile/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/readblenfile/intern/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/readblenfile/stub/Makefile | 2 | ||||
| -rw-r--r-- | source/blender/readblenfile/test/Makefile | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/readblenfile/CMakeLists.txt b/source/blender/readblenfile/CMakeLists.txt index 306544fec78..a6522ffa758 100644 --- a/source/blender/readblenfile/CMakeLists.txt +++ b/source/blender/readblenfile/CMakeLists.txt @@ -31,4 +31,3 @@ SET(INC ) BLENDERLIB(bf_readblenfile "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['common','player'], priority = [0, 220] ) diff --git a/source/blender/readblenfile/Makefile b/source/blender/readblenfile/Makefile index d291cb84315..f0a46d077a8 100644 --- a/source/blender/readblenfile/Makefile +++ b/source/blender/readblenfile/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. diff --git a/source/blender/readblenfile/intern/Makefile b/source/blender/readblenfile/intern/Makefile index 54316903f23..dc59ca3b9ed 100644 --- a/source/blender/readblenfile/intern/Makefile +++ b/source/blender/readblenfile/intern/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. diff --git a/source/blender/readblenfile/stub/Makefile b/source/blender/readblenfile/stub/Makefile index a2b0fe88f6a..94a55407418 100644 --- a/source/blender/readblenfile/stub/Makefile +++ b/source/blender/readblenfile/stub/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. diff --git a/source/blender/readblenfile/test/Makefile b/source/blender/readblenfile/test/Makefile index 50f50f5c54c..cc294ac60b3 100644 --- a/source/blender/readblenfile/test/Makefile +++ b/source/blender/readblenfile/test/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. |