Merge branch 'master' of github.com:ascorbic/vendor

Conflicts: .gitmodules
ascorbic · Jul 8, 2010 · c409ad2 · c409ad2
2 parents 3ed5aa8 + 124553e
commit c409ad2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "facebook"]
 	path = facebook
 	url = http://github.com/facebook/php-sdk.git
+[submodule "doctrine"]
+	path = doctrine
+	url = git://github.com/ascorbic/doctrine-tracker.git
diff --git a/doctrine b/doctrine