diff options
| author | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-11 21:07:42 +0100 |
| commit | 195bbe8ce218533569dde1368d04da0fd229913d (patch) | |
| tree | 29d3db04673f59dcfd6663c524a5c1343d5cbee6 /src/glsl/glsl_parser.h | |
| parent | 99b57bc20e839043ec6160502814085a0976fccc (diff) | |
| parent | d67df5dd9db1cede92f1b177c890f83809bb4582 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/glsl/glsl_parser.h')
| -rw-r--r-- | src/glsl/glsl_parser.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/glsl/glsl_parser.h b/src/glsl/glsl_parser.h index 1101d4977cf..9bb6ae62991 100644 --- a/src/glsl/glsl_parser.h +++ b/src/glsl/glsl_parser.h @@ -1,9 +1,10 @@ -/* A Bison parser, made by GNU Bison 2.4.3. */ + +/* A Bison parser, made by GNU Bison 2.4.1. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + 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 @@ -235,7 +236,7 @@ typedef union YYSTYPE { -/* Line 1685 of yacc.c */ +/* Line 1676 of yacc.c */ #line 52 "glsl_parser.ypp" int n; @@ -268,8 +269,8 @@ typedef union YYSTYPE -/* Line 1685 of yacc.c */ -#line 273 "glsl_parser.h" +/* Line 1676 of yacc.c */ +#line 274 "glsl_parser.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |