[Pkg-cli-libs-commits] [SCM] allpackages branch, master, updated. ad3a68fa2a7de5b376d9edc43115aea03710218d

[Jo Shields]

The following commit has been merged in the master branch:
commit ad3a68fa2a7de5b376d9edc43115aea03710218d
Merge: bcd170f4a15157483a51f06e2261ebd1472e1f9e 7d9dde478387ac5b22aa0da446cec7c9a5fd460e
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Sep 27 11:49:30 2010 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-libs/packages/allpackages
    
    Conflicts:
    	.gitmodules

diff --combined .gitmodules
index d24a506,4bc8a76..1b5564f
--- a/.gitmodules
+++ b/.gitmodules
@@@ -49,6 -49,6 +49,9 @@@
  [submodule "gkeyfile-sharp.git"]
  	path = gkeyfile-sharp.git
  	url = ../gkeyfile-sharp.git
 +[submodule "webkit-sharp.git"]
 +	path = webkit-sharp.git
 +	url = ../webkit-sharp.git
+ [submodule "gtk-sharp-beans.git"]
+ 	path = gtk-sharp-beans.git
+ 	url = ../gtk-sharp-beans.git

-- 
allpackages