diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 20:57:59 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 20:58:15 +0200 |
| commit | bbc476ecb97713ef88f7ff8be4f5f0131caabd1b (patch) | |
| tree | c6580b8315aaa5ad0f0bad3843fa10dbab3d0ae1 /.gitattributes | |
| parent | 660b931615211cc85c0086448409c43526c6f85f (diff) | |
| parent | 0862901b142f36e91b98dbdcb2c36585020bb33d (diff) | |
Merge branch 'stable' into dev
Change-Id: Id44a93ddf8dc778f44e9684842a759d585558ee4
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions