summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2015-01-01 16:05:14 +0100
committerLuca Bruno <lucabru@src.gnome.org>2015-01-01 16:05:14 +0100
commitbcc6ae8dc5137b557979340a7b82cf63254734f2 (patch)
treeb0e1607644221ff7f32028eee0d68d460db6e582 /doc
parent4faa301c59e2ec758b889be7bf6d353f40b9c41c (diff)
parent9bcc61ce5536ed05bb59534ea8c0fd2e9a53aec0 (diff)
downloadvala-bcc6ae8dc5137b557979340a7b82cf63254734f2.tar.gz
Merge branch 'master' into wip/transform
Conflicts: codegen/valaccodebasemodule.vala
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions