diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:52:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:52:10 +0200 |
| commit | 27e27cedfc009cbd25f57ec869eb998f9419951c (patch) | |
| tree | 511750a194808cb0f39b198ab18029bb7397dc38 /smiley_da | |
| parent | 9ec8b89f51e0b631163c51724e32184b84770e4c (diff) | |
| parent | 63dbb0b0b7697c2c789582c6e8cbb2010c5ac386 (diff) | |
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'smiley_da')
0 files changed, 0 insertions, 0 deletions