diff options
| author | Simon Schampijer <simon@schampijer.de> | 2007-07-11 17:07:15 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2007-07-11 17:07:15 (GMT) |
| commit | d267599aaa92372d0d9a868f1662f3aec60d722d (patch) | |
| tree | 27fe5c0c65a78d01b6d91e36eea711288d77e16b /NEWS | |
| parent | 4f1c45f839898bd012e5ae1427c840c88044c38c (diff) | |
| parent | 25c7815ffa8c93508d95314beab1f93dcd8f7b75 (diff) | |
Merge branch 'tubes'
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1 +1,5 @@ +<<<<<<< HEAD:NEWS First version of the collaborated memosono. (erikos) +======= +The initial collaborated memosono (erikos). +>>>>>>> tubes:NEWS |