diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-24 16:18:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-24 16:18:23 +0200 |
commit | c9425926e13fcfbd8fe5b69d658fadab928f1d16 (patch) | |
tree | 05e7f0ed43882bd9f8dd30ecd38df25906f45656 /gnuwin32/share/bison/c++-skel.m4 | |
parent | f587983764be7d127305d350c76702b7e28ea0f1 (diff) | |
parent | 56e7af096e889d56ef67baabf38529c0ccb8d8b5 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns
Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50
Diffstat (limited to 'gnuwin32/share/bison/c++-skel.m4')
-rw-r--r-- | gnuwin32/share/bison/c++-skel.m4 | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gnuwin32/share/bison/c++-skel.m4 b/gnuwin32/share/bison/c++-skel.m4 deleted file mode 100644 index b8089ff8..00000000 --- a/gnuwin32/share/bison/c++-skel.m4 +++ /dev/null @@ -1,25 +0,0 @@ - -*- Autoconf -*- - -# C++ skeleton dispatching for Bison. -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -b4_glr_if( [m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])]) -b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_pkgdatadir/[glr.cc]])]) - -m4_define_default([b4_used_skeleton], [b4_pkgdatadir/[lalr1.cc]]) -m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) - -m4_include(b4_used_skeleton) |