Merge pull request #2322 from PHLAK/master

Added 3rdparty folder as a git submodule
2013-03-16 06:31:16 -07:00 · 2013-03-16 06:31:16 -07:00 · 25175937a9
commit 25175937a9
parent 047ceaac0f 7f43d6559f
3 changed files with 4 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,6 @@ owncloud
 config/config.php
 config/mount.php
 apps/inc.php
-3rdparty

 # ignore all apps except core ones
 apps/*
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "3rdparty"]
+	path = 3rdparty
+	url = git://github.com/owncloud/3rdparty.git
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit 63cb2847921d668c2b48b572872cfddbcf41bea4
				`@ -0,0 +1 @@`
				`Subproject commit 63cb2847921d668c2b48b572872cfddbcf41bea4`