Merge remote-tracking branch 'origin/gir-docbook'

Browse Source

Conflicts:
	.gitignore
	tests/scanner/Regress-1.0-expected.gir

...

This commit is contained in:

Johan Dahlin 2011-08-13 14:42:05 -03:00 committed by Johan Dahlin

parent 4ce922a903 1dcf01a490

commit 5167265aae

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available