| commit | 77adfd7aff974392ded443f9be1732d8ec3f9e2f | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Sun, 25 Jul 2010 22:47:34 +0000 (26 00:47 +0200) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Sun, 25 Jul 2010 22:47:34 +0000 (26 00:47 +0200) | ||
| tree | 914cd84c0e8e2bae28e20d26bafb9f3772487b36 | treesnapshot (tar.gz zip) |
| parent | 2e195e52421a3fe798a0dc9ad8b31bf6a2e1836a | commitdiff |
| parent | 2afa513584a101d2f13ee53b0717a77a58217268 | commitdiff |
Merge branch 'master' into gsoc-dir-split
Conflicts:
apps/settings.h
Conflicts:
apps/settings.h
| apps/settings.c | diff1 | diff2 | blobhistory |
| apps/settings.h | diff1 | diff2 | blobhistory |