  
 diff -r ffde119d297e src/ScintillaBase.cxx
 --- scintilla/src/ScintillaBase.cxx	Wed Jul 28 17:54:24 2010 +1000
-+++ scintilla/src/ScintillaBase.cxx	Tue Aug 17 00:13:24 2010 -0400
++++ scintilla/src/ScintillaBase.cxx	Tue Aug 17 22:27:08 2010 -0400
 @@ -477,6 +477,7 @@
  	PropSetSimple props;
  public:

 const char *LexState::DescribeWordListSets() {
diff -r ffde119d297e win32/deps.mak
--- scintilla/win32/deps.mak	Wed Jul 28 17:54:24 2010 +1000
+++ scintilla/win32/deps.mak	Tue Aug 17 00:13:24 2010 -0400
@@ -103,6 +103,11 @@
 StyleContext.o: ../lexlib/StyleContext.cxx ../include/ILexer.h \
  ../lexlib/LexAccessor.h ../lexlib/Accessor.h ../lexlib/StyleContext.h

 
diff -r ffde119d297e lexers/LexLPeg.cxx
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ scintilla/lexers/LexLPeg.cxx	Tue Aug 17 22:27:08 2010 -0400
@@ -0,0 +1,461 @@
+/**
+ * Lua-powered dynamic language lexer for Scintillua.
+ * http://scintillua.googlecode.com
+ *
+ * Copyright 2006-2010 Mitchell mitchell<att>caladbolg.net.
+ * This file is distributed under Scintilla's license.
+ *
+ * Documentation can be found in /lexers/lexer.lua.
+ */
+
+#include <assert.h> // for Accessor.h
+#include <ctype.h>
