Merge pull request #93 from deBorn/master

Conflicts:
	.gitmodules
This commit is contained in:
Justin Mayer
2013-04-21 11:12:41 -07:00

3
.gitmodules vendored
View File

@@ -31,3 +31,6 @@
[submodule "water-iris"]
path = water-iris
url = git://github.com/jarv/water-iris
[submodule "whispers"]
path = whispersTheme
url = git://github.com/deBorn/whispersTheme.git