Merge.
Merge.
1.1 --- a/src/GlobalRoots.cpp Sun Jul 29 12:24:49 2012 -0700
1.2 +++ b/src/GlobalRoots.cpp Sun Jul 29 12:24:59 2012 -0700
1.3 @@ -1,4 +1,5 @@
1.4 -/*
1.5 +/* vim: set ts=4 sw=4 tw=99 et:
1.6 + *
1.7 * Copyright (C) 2004-2012 David Anderson
1.8 *
1.9 * This file is part of SourcePawn.
2.1 --- a/src/GlobalRoots.h Sun Jul 29 12:24:49 2012 -0700
2.2 +++ b/src/GlobalRoots.h Sun Jul 29 12:24:59 2012 -0700
2.3 @@ -1,4 +1,5 @@
2.4 -/*
2.5 +/* vim: set ts=4 sw=4 tw=99 et:
2.6 + *
2.7 * Copyright (C) 2004-2012 David Anderson
2.8 *
2.9 * This file is part of SourcePawn.
3.1 --- a/src/Parser.h Sun Jul 29 12:24:49 2012 -0700
3.2 +++ b/src/Parser.h Sun Jul 29 12:24:59 2012 -0700
3.3 @@ -1,4 +1,5 @@
3.4 -/*
3.5 +/* vim: set ts=4 sw=4 tw=99 et:
3.6 + *
3.7 * Copyright (C) 2012 David Anderson
3.8 *
3.9 * This file is part of SourcePawn.