git.ipfire.org Git - thirdparty/ccache.git/commit

]> git.ipfire.org Git - thirdparty/ccache.git/commit

projects / thirdparty / ccache.git / commit

author	Joel Rosdahl <joel@rosdahl.net>
	Sat, 7 Mar 2015 15:26:39 +0000 (16:26 +0100)
committer	Joel Rosdahl <joel@rosdahl.net>
	Sat, 7 Mar 2015 15:26:39 +0000 (16:26 +0100)
commit	7f89aa92da768434429fa012c3f89dffd71b4f50
tree	1afff81e1dc3c1d04f2da677b375cda19ce12f24	tree \| snapshot
parent	350f0fe5f9e631209d41fd80e7f2260b7d937c31	commit \| diff
parent	27f8ded6264a451b987973a8e58a3a1cb8457a75	commit \| diff

Merge branch '3.1-maint' into 3.2-maint

* 3.1-maint:
  Prepare for v3.1.11
  Update NEWS.txt
  Tweak copyright years
  Fix comment scanning bug in hash_source_code_string

Conflicts:
NEWS.txt
dev.mk.in
hashutil.c
test.sh
test/test_hashutil.c

NEWS.txt	diff1 \|	diff2 \|	blob \| history
hashutil.c	diff1 \|	diff2 \|	blob \| history
test.sh	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/ccache/ccache.git

RSS Atom

NEWS.txt	diff1 \|	diff2 \|	blob \| history
hashutil.c	diff1 \|	diff2 \|	blob \| history
test.sh	diff1 \|	diff2 \|	blob \| history