Merge branch 'master' of github.com:feross/Fireflock

feross · Nov 6, 2011 · 9d6aa4b · 9d6aa4b
2 parents c2f0271 + 13dd774
commit 9d6aa4b
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 1 deletion.
diff --git a/resources/fireflock.qrc b/resources/fireflock.qrc
@@ -8,6 +8,7 @@
 	<file>js/libs/modernizr-2.0.6.min.js</file>
 	<file>js/stories/request.js</file>
 	<file>js/stories/youtube.js</file>
+	<file>js/identifyUser.js</file>
 	<file>js/plugins.js</file>
 	<file>js/script.js</file>
 </qresource>

diff --git a/resources/index.html b/resources/index.html
@@ -94,6 +94,7 @@ <h1>Anon User 1</h1>
 
   <script src="js/stories/request.js"></script>
   <script src="js/stories/youtube.js"></script>
+  <script src="js/identifyUser.js"></script>
 
   <script src="js/plugins.js"></script>
   <script src="js/users.js"></script>