| commit | b9bb04ae38feaa93ba35d5e0f237e366b585a98a | |
| author | Felix Bechstein <f@ub0r.de> | |
| Fri, 29 Jan 2010 15:32:55 +0000 (29 16:32 +0100) | ||
| committer | Felix Bechstein <f@ub0r.de> | |
| Fri, 29 Jan 2010 15:32:55 +0000 (29 16:32 +0100) | ||
| tree | f2e588045bf1f66c19f64edc0b6665ff1ad5e9a2 | treesnapshot (tar.gz zip) |
| parent | fc6b8496e99a0e8c9e842c88cb8892f5848598c5 | commitdiff |
| parent | bd6e2519c57d042fe5e080b5c4908623ed479018 | commitdiff |
Merge branch 'split-updater'
Conflicts:
res/values/update.xml
Conflicts:
res/values/update.xml
| res/values/update.xml | diff1 | diff2 | blobhistory |