changeset 705:541854f0605c trunk

[svn] Steal parser from paranormal and make sure all datestamps are the same so yacc does not run.
author chainsaw
date Sat, 24 Feb 2007 05:58:15 -0800
parents 94b22cc75eb8
children 6bc134eec1f3
files ChangeLog src/rovascope/libcalc/parser.y
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 23 20:30:42 2007 -0800
+++ b/ChangeLog	Sat Feb 24 05:58:15 2007 -0800
@@ -1,3 +1,13 @@
+2007-02-24 04:30:42 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1494]
+  - VFS probing support patch by Christian Birchinger (joker).
+  
+  trunk/src/modplug/modplugbmp.cxx |  134 ++++++++++++---------------------------
+  trunk/src/modplug/modplugbmp.h   |    2 
+  trunk/src/modplug/plugin.cxx     |    8 +-
+  3 files changed, 49 insertions(+), 95 deletions(-)
+
+
 2007-02-24 04:23:34 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1492]
   - rework AdPlug to use VFS properly
--- a/src/rovascope/libcalc/parser.y	Fri Feb 23 20:30:42 2007 -0800
+++ b/src/rovascope/libcalc/parser.y	Sat Feb 24 05:58:15 2007 -0800
@@ -19,6 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
  */
 
+/* suppress conflict warnings */
+%expect 37
+
 /* C declarations. */
 %{
 #include <ctype.h>