diff options
| author | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-08-22 12:05:32 +0100 |
|---|---|---|
| committer | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-08-22 12:05:32 +0100 |
| commit | c87733695939a01290a72955196a552218b1465b (patch) | |
| tree | beac8cf75bfee95c1528e941d9bb238135b5646c /docs | |
| parent | a1f29c082515ce22bd56dc859bb22a4f673f0cfe (diff) | |
| parent | ac3cb0a0ac24e9931e710f3e1e28f34282f8377f (diff) | |
Merge commit 'origin/master' into tubes
Conflicts:
src/salut-tubes-channel.c
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/.git-darcs-dir | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/.git-darcs-dir b/docs/.git-darcs-dir deleted file mode 100644 index e69de29b..00000000 --- a/docs/.git-darcs-dir +++ /dev/null |