diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:51:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:51:10 +0200 |
| commit | b0e3717da09c28fe33bd86a00df83039eed705d2 (patch) | |
| tree | 957be5e148d7feb3b4b39b7713ffdfe62c1e965e /smiley | |
| parent | b01432549c31b47de2b4cd907585477df5fc4dbd (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
Makefile
smiley
Diffstat (limited to 'smiley')
| m--------- | smiley | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/smiley b/smiley -Subproject 53c7e615015d7a1a504996e001a8ce38df41f35 +Subproject 30dd469765c2396ded03355876af391e922e89b |