[cg3] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages/cg3
Kartik Mistry
kartik at moszumanska.debian.org
Tue Jun 23 09:49:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
kartik pushed a commit to branch master
in repository cg3.
commit cf213054d37f9e73b73108a069f4f918b7454200
Merge: 9aecfc9 da2623f
Author: Kartik Mistry <kartik.mistry at gmail.com>
Date: Tue Jun 23 15:18:21 2015 +0530
Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages/cg3
ChangeLog | 13 ++++++++-----
debian/changelog | 2 +-
scripts/profile-revisions.php | 2 +-
src/Cohort.cpp | 5 -----
src/Cohort.hpp | 2 +-
src/Grammar.cpp | 5 ++++-
src/Grammar.hpp | 4 ++--
src/GrammarApplicator_matchSet.cpp | 10 ++++++----
src/GrammarApplicator_reflow.cpp | 3 ++-
src/GrammarApplicator_runRules.cpp | 7 +++++--
src/inlines.hpp | 6 +++---
src/stdafx.hpp | 1 +
src/version.hpp | 2 +-
13 files changed, 35 insertions(+), 27 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cg3.git
More information about the debian-science-commits
mailing list