diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-16 20:48:58 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-16 20:48:58 +0000 |
| commit | ab67ec869521a4b8b687103eb1ea01cb8b023eef (patch) | |
| tree | 368f581e69d33197d919e9677472574bc64d4d4e /doc/coding.txt | |
| parent | 0b37038d2ba67b2f57511f5ebd459f2da1b78a6a (diff) | |
| parent | 9845499fa14e76161e8b349bb7eccce69578492c (diff) | |
Merge branch '0.6.x' into 0.7.x
Conflicts:
src/main.cpp
Diffstat (limited to 'doc/coding.txt')
0 files changed, 0 insertions, 0 deletions