Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Conflicts:
	fdroidserver/common.py
This commit is contained in:
David Black 2013-02-11 16:05:24 +00:00
commit 25c6c4abd4
4 changed files with 43 additions and 16 deletions

View file

@ -1511,6 +1511,13 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
raise BuildException('Error updating AndrozicLib project')
return sdir
if name == 'Otr4j':
sdir = os.path.join(extlib_dir, 'Otr4j')
vcs = getvcs('git',
'https://github.com/redsolution/otr4j.git', sdir, sdk_path)
vcs.gotorevision(ref)
return sdir
if name == 'AnySoftKeyboardTools':
sdir = os.path.join(extlib_dir, 'AnySoftKeyboardTools')
vcs = getvcs('git',