| commit | 57e2290ece2ad9208278349a651b6c0f9f70866d | |
| author | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Mon, 21 Jun 2010 15:51:47 +0000 (21 17:51 +0200) | ||
| committer | Thomas Martitz <thomas.martitz@student.htw-berlin.de> | |
| Mon, 21 Jun 2010 15:51:47 +0000 (21 17:51 +0200) | ||
| tree | e03516fe786862581fc403c4ccd88c5d92b4496c | treesnapshot (tar.gz zip) |
| parent | 16603d718cafdcc3c7ff7f96087493c416e0469f | commitdiff |
| parent | 18eb7427631ab655bda54d08954dccc15e33d066 | commitdiff |
Merge branch 'master' into gsoc-ifdef-cleanup
| apps/debug_menu.c | diff1 | diff2 | blobhistory |
| apps/settings.c | diff1 | diff2 | blobhistory |
| firmware/SOURCES | diff1 | diff2 | blobhistory |
| firmware/export/system.h | diff1 | diff2 | blobhistory |