]> git.ipfire.org Git - thirdparty/vala.git/commit
Merge branch 'staging'
authorLuca Bruno <lucabru@src.gnome.org>
Mon, 21 Oct 2013 18:10:03 +0000 (20:10 +0200)
committerLuca Bruno <lucabru@src.gnome.org>
Mon, 21 Oct 2013 18:10:03 +0000 (20:10 +0200)
commit4038abdfdde146ec46c3037035a4e4c14e97942e
treec71f26ba8720c312fe5426569ddda7075e6fe856
parentb05fa3325c4c8f3c987a2875b72d5317fc82e4fb
parentaa6c377fc4ce99db76db24c9eaf7db493c561b70
Merge branch 'staging'

Conflicts:
vala/valagirparser.vala
vala/valagirparser.vala