Merge branch 'master' of github.com:amaurybrisou/OwnKernel

Conflicts: .svn/wc.db
amaurybrisou · Dec 21, 2012 · b4c9d01 · b4c9d01
2 parents a0d37a5 + abc5b0d
commit b4c9d01
Show file tree

Hide file tree

Showing 59 changed files with 296 additions and 2,087 deletions.
diff --git a/.svn/entries b/.svn/entries
diff --git a/.svn/format b/.svn/format
diff --git a/.svn/pristine/0c/0ce42fb2eb275ff19677bc6133ec456ed5a66cf8.svn-base b/.svn/pristine/0c/0ce42fb2eb275ff19677bc6133ec456ed5a66cf8.svn-base
diff --git a/.svn/pristine/21/21a5519f763d59732338ff2e18b64296ed2fda29.svn-base b/.svn/pristine/21/21a5519f763d59732338ff2e18b64296ed2fda29.svn-base
diff --git a/.svn/pristine/26/2611562be0dd5adf30f333ddd2fa5be1c9123495.svn-base b/.svn/pristine/26/2611562be0dd5adf30f333ddd2fa5be1c9123495.svn-base
diff --git a/.svn/pristine/28/2811e6d84e9be5c9d9ce6787cc8a1ce1018fe74b.svn-base b/.svn/pristine/28/2811e6d84e9be5c9d9ce6787cc8a1ce1018fe74b.svn-base
diff --git a/.svn/pristine/28/28281141436209d83eda47c06711fad7fb7a3bdf.svn-base b/.svn/pristine/28/28281141436209d83eda47c06711fad7fb7a3bdf.svn-base
diff --git a/.svn/pristine/2c/2c9481cde22cd769ca9a0fa22d85807c83269336.svn-base b/.svn/pristine/2c/2c9481cde22cd769ca9a0fa22d85807c83269336.svn-base