2
0

Merge branch 'master' of github.com:Lyndir/MasterPassword

Conflicts:
	.gitmodules
This commit is contained in:
Maarten Billemont
2013-12-19 08:17:29 -05:00
18 changed files with 2116 additions and 41 deletions

6
.gitmodules vendored
View File

@@ -13,9 +13,9 @@
[submodule "External/RHStatusItemView"]
path = External/RHStatusItemView
url = git://github.com/lhunath/RHStatusItemView.git
[submodule "External/DCIntrospect"]
path = External/DCIntrospect
url = https://github.com/lhunath/DCIntrospect.git
[submodule "External/LoveLyndir"]
path = External/LoveLyndir
url = git://github.com/Lyndir/love-lyndir.client.git
[submodule "External/DCIntrospect"]
path = External/DCIntrospect
url = https://github.com/lhunath/DCIntrospect.git