# HG changeset patch
# User David Anderson <dvander@alliedmods.net>
# Date 1343589899 25200
# Node ID dae60280a1f7765232d8786f9929e108e30bcfd6
# Parent  86b368a4d80d79085acb12a9d4ba3d01b8a8f46a# Parent  74ad30a6214accab2bcbd5069ecd4930ce74fe27
Merge.

diff -r 86b368a4d80d -r dae60280a1f7 src/GlobalRoots.cpp
--- a/src/GlobalRoots.cpp	Sun Jul 29 12:24:49 2012 -0700
+++ b/src/GlobalRoots.cpp	Sun Jul 29 12:24:59 2012 -0700
@@ -1,4 +1,5 @@
-/*
+/* vim: set ts=4 sw=4 tw=99 et:
+ *
  * Copyright (C) 2004-2012 David Anderson
  *
  * This file is part of SourcePawn.
diff -r 86b368a4d80d -r dae60280a1f7 src/GlobalRoots.h
--- a/src/GlobalRoots.h	Sun Jul 29 12:24:49 2012 -0700
+++ b/src/GlobalRoots.h	Sun Jul 29 12:24:59 2012 -0700
@@ -1,4 +1,5 @@
-/*
+/* vim: set ts=4 sw=4 tw=99 et:
+ *
  * Copyright (C) 2004-2012 David Anderson
  *
  * This file is part of SourcePawn.
diff -r 86b368a4d80d -r dae60280a1f7 src/Parser.h
--- a/src/Parser.h	Sun Jul 29 12:24:49 2012 -0700
+++ b/src/Parser.h	Sun Jul 29 12:24:59 2012 -0700
@@ -1,4 +1,5 @@
-/*
+/* vim: set ts=4 sw=4 tw=99 et:
+ *
  * Copyright (C) 2012 David Anderson
  *
  * This file is part of SourcePawn.