summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLandry Breuil <landry@rhaalovely.net>2014-03-07 17:27:08 +0100
committerLandry Breuil <landry@rhaalovely.net>2014-03-07 17:27:08 +0100
commit633114ffb5d67bfde83584dbdf08b6726820eaa6 (patch)
treebd1fb2f78dfa95fbeddd9730d6c37bc8ca98d473
parent8ac3fd842f90ef96f92f65e7523bb8eb5e27b01e (diff)
parent3824461c2e70adae737bd534b2ec68cc3bc32ced (diff)
Merge branch '2.4' of http://rhaalovely.net/git/webkit into 2.4
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index e587d63..499dff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.#*
*.orig
+CVS