From c7c4883f49e866020aee373dcf180c182e20d2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Westlin?= <bwestlin@gmail.com>
Date: Sun, 21 Sep 2014 22:08:12 +0200
Subject: [PATCH] Added files generated by Typesafe Activator to vendor.yml

---
 lib/linguist/vendor.yml | 4 ++++
 test/test_blob.rb       | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml
index 270ad593..717ed876 100644
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -235,3 +235,7 @@
 - octicons.css
 - octicons.min.css
 - sprockets-octicons.scss
+
+# Typesafe Activator
+- (^|/)activator$
+- (^|/)activator\.bat$
diff --git a/test/test_blob.rb b/test/test_blob.rb
index 968abf09..f7065aab 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -437,6 +437,12 @@ class TestBlob < Test::Unit::TestCase
     assert blob("octicons.css").vendored?
     assert blob("public/octicons.min.css").vendored?
     assert blob("public/octicons/sprockets-octicons.scss").vendored?
+
+    # Typesafe Activator
+    assert blob("activator").vendored?
+    assert blob("activator.bat").vendored?
+    assert blob("subproject/activator").vendored?
+    assert blob("subproject/activator.bat").vendored?
   end
 
   def test_language