diff options
author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
---|---|---|
committer | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
commit | 9cdf435dac257e7e4a0598bac9491025b5605e64 (patch) | |
tree | 1438f7442281478154217c39dab08a935839c7ac /lib/gmock-1.7.0/gtest/m4/ltversion.m4 | |
parent | a17bdf8dc89763c74aadc794ac8574da11dc1d99 (diff) | |
parent | 9839b45e764e5222054280190b6fe835522e2949 (diff) |
Merge branch 'master' into migrate-to-QJSEngine
# Conflicts:
# build/depends.py
# src/controllers/hid/hidcontroller.cpp
# src/controllers/hid/hidcontroller.h
Diffstat (limited to 'lib/gmock-1.7.0/gtest/m4/ltversion.m4')
-rw-r--r-- | lib/gmock-1.7.0/gtest/m4/ltversion.m4 | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/lib/gmock-1.7.0/gtest/m4/ltversion.m4 b/lib/gmock-1.7.0/gtest/m4/ltversion.m4 deleted file mode 100644 index 07a8602d48..0000000000 --- a/lib/gmock-1.7.0/gtest/m4/ltversion.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# ltversion.m4 -- version numbers -*- Autoconf -*- -# -# Copyright (C) 2004 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# @configure_input@ - -# serial 3337 ltversion.m4 -# This file is part of GNU Libtool - -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) - -AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -_LT_DECL(, macro_revision, 0) -]) |