diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-01 19:20:57 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-01 19:20:57 +0100 |
| commit | dda6516c5406e08f9e2dec391e075d5f2e075e6d (patch) | |
| tree | 7cf11b7496a7a83478fcd5a097c45d462ddf6da1 /.gitignore | |
| parent | dfcafbec34e0e454d9995551998af5d40a27c7ad (diff) | |
| download | audiomanager-dda6516c5406e08f9e2dec391e075d5f2e075e6d.tar.gz | |
* solved merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,3 +5,4 @@ build/ doc/ packages/ .* +/packages |