parent: b9eac7 | patch | commitdiff
Chris McDonough
2011-11-07 512982bc876cbab7dc0671c1e807f57d64bf718b
refs
author Chris McDonough <chrism@plope.com>
Monday, November 7, 2011 21:30 +0100
committer Chris McDonough <chrism@plope.com>
Monday, November 7, 2011 21:30 +0100
commit512982bc876cbab7dc0671c1e807f57d64bf718b
tree 62845b570b993c5fab3d2604d0ed8198d76eae35 tree | zip | gz
parent b9eac7ede70525b04bc0cf5341e258b92a2edb96 view | diff
2723b03b611de3512f46c09f8c53ec324cdee7fc view | diff 
resolve conflict
2 files modified
6 ■■■■■ changed files
CONTRIBUTORS.txt 4 ●●●●● diff | view | raw | blame | history
docs/tutorials/wiki/basiclayout.rst 2 ●●●●● diff | view | raw | blame | history