diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:47:02 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:47:02 +0200 |
| commit | c4e8008965cfa559d3884e3f8efff96fb54a2477 (patch) | |
| tree | 7489b7d842a3b680c9ff84a429f69e7f62a431e5 /smiley | |
| parent | bc2b44033c71ca7f5af9c83cb08c82097878e216 (diff) | |
| parent | cc664f282400169a489e901e06ee87a32599d0d0 (diff) | |
Merge branch '_da' into da
Conflicts:
Makefile (manually resolved)
Diffstat (limited to 'smiley')
| m--------- | smiley | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/smiley b/smiley new file mode 160000 +Subproject 30dd469765c2396ded03355876af391e922e89b |