diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:48:50 +0200 |
| commit | 00416c4072095e97f099116ccc31675e2a3c881b (patch) | |
| tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /javascript | |
| parent | 33557b73e518e0549e3dabc9a89a2c805c2a62f1 (diff) | |
| parent | a3a014542bddda8ba54f45078232cceeadfa505b (diff) | |
Merge branch '_multilang' into multilang
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'javascript')
| m--------- | javascript | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/javascript b/javascript -Subproject dea1eff3d9e9781e5b92a326ad7df17d3ba8ba1 +Subproject 9bf18ddbcb122e0f0005c06870c3b792bf7d9b0 |