From 5edd5c5ef8046fa0de648e4e723d3d4121d77bb9 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Mon, 31 Mar 2014 11:37:46 +0100
Subject: [PATCH] Bring .p4ignore up to date so that p4 status is clean.

Copied from Perforce
 Change: 185101
 ServerID: perforce.ravenbrook.com
---
 mps/.p4ignore        | 2 ++
 mps/code/.p4ignore   | 1 +
 mps/manual/.p4ignore | 1 +
 3 files changed, 4 insertions(+)

diff --git a/mps/.p4ignore b/mps/.p4ignore
index ba720759d8c..fb2e5c024e5 100644
--- a/mps/.p4ignore
+++ b/mps/.p4ignore
@@ -16,3 +16,5 @@ TAGS
 *.dSYM
 code/*/*/*.d
 *.pyc
+test/test/log
+test/test/obj
diff --git a/mps/code/.p4ignore b/mps/code/.p4ignore
index 7a9dfb599a8..dcda2b9ad09 100644
--- a/mps/code/.p4ignore
+++ b/mps/code/.p4ignore
@@ -9,6 +9,7 @@ lii6ll
 w3i3mv
 w3i6mv
 xci3gc
+xci6ll
 # Visual Studio junk
 Debug
 Release
diff --git a/mps/manual/.p4ignore b/mps/manual/.p4ignore
index 3902ee8b103..ef6464692c9 100644
--- a/mps/manual/.p4ignore
+++ b/mps/manual/.p4ignore
@@ -1,2 +1,3 @@
 doctrees
 converted
+html