summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorblacky <blacky@kiwi.(none)>2011-07-05 20:51:58 +0200
committerblacky <blacky@kiwi.(none)>2011-07-05 20:51:58 +0200
commit0108869db26775b5e30028b0956adb2007020a10 (patch)
tree35d8457c83321ba0ac5ab0f14b78c7c282f943bc /README
parent4a32aebe3776323c176e0fe57298c1220ecc6d2c (diff)
downloadaudiomanager-0108869db26775b5e30028b0956adb2007020a10.tar.gz
merge due to non empty Repo on genivi git server. Resolving conflics in the READMEFILE
Diffstat (limited to 'README')
-rw-r--r--README1
1 files changed, 0 insertions, 1 deletions
diff --git a/README b/README
index cccd2dd..7b0271e 100644
--- a/README
+++ b/README
@@ -225,4 +225,3 @@ To use make out of eclipse them, replace the default make command "make" with so
`---' `---'
-