diff options
| author | Lukas Zeller <luz@synthesis.ch> | 2009-10-08 11:01:17 +0200 |
|---|---|---|
| committer | Lukas Zeller <luz@synthesis.ch> | 2009-10-08 11:01:17 +0200 |
| commit | 31f332ebf4d90a7524d6814939c88562cc0b275c (patch) | |
| tree | 4744e2db5a97775e811b128cf3ee97b30560fc86 /src/sysync/multifielditem.h | |
| parent | 139f90cf9ebd0f26ebdcc1bf8c5f35e89d75884c (diff) | |
| parent | 6186b1be9f43d85ffac848f54bef89ec9197d952 (diff) | |
Merge remote branch 'moblin/unilib' into unilib
luz: not sure if I resolved the conflict properly,
please check last few lines of the file.
Conflicts:
configure.in
Diffstat (limited to 'src/sysync/multifielditem.h')
0 files changed, 0 insertions, 0 deletions