sambas 6989468d17 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext ... Conflicts: .gitignore		2013-04-14 10:13:51 +03:00
..
uavobjectdefinition	Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext	2013-04-14 10:13:51 +03:00
.gitattributes	Normalize line endings	2013-04-07 09:49:13 +03:00