summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386>2011-09-09 07:06:32 +0000
committervladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386>2011-09-09 07:06:32 +0000
commit7bd984a33cd0ccb1fcda94d982d4170e0b409d07 (patch)
treebe5a1c82ee102dd96155586283fdc25eef8c4208
parent6f00403b0a79708ddb45040e3d3c53adefa18b88 (diff)
downloadgooglemock-7bd984a33cd0ccb1fcda94d982d4170e0b409d07.tar.gz
Renames the license files.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@396 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r--LICENSE (renamed from COPYING)0
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--scripts/generator/LICENSE (renamed from scripts/generator/COPYING)0
4 files changed, 2 insertions, 2 deletions
diff --git a/COPYING b/LICENSE
index 1941a11..1941a11 100644
--- a/COPYING
+++ b/LICENSE
diff --git a/Makefile.am b/Makefile.am
index 3e11b32..0afce2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,7 +140,7 @@ EXTRA_DIST += scripts/fuse_gmock_files.py
# The Google Mock Generator tool from the cppclean project.
EXTRA_DIST += \
- scripts/generator/COPYING \
+ scripts/generator/LICENSE \
scripts/generator/README \
scripts/generator/README.cppclean \
scripts/generator/cpp/__init__.py \
diff --git a/configure.ac b/configure.ac
index e8b65bd..05b90c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([Google C++ Mocking Framework],
# Provide various options to initialize the Autoconf and configure processes.
AC_PREREQ([2.59])
-AC_CONFIG_SRCDIR([./COPYING])
+AC_CONFIG_SRCDIR([./LICENSE])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([build-aux/config.h])
AC_CONFIG_FILES([Makefile])
diff --git a/scripts/generator/COPYING b/scripts/generator/LICENSE
index 87ea063..87ea063 100644
--- a/scripts/generator/COPYING
+++ b/scripts/generator/LICENSE