Merge branch 'master' into f16

Conflicts: .gitignore sources viewvc.spec
2012-10-31 17:28:40 +11:00 · 2012-10-26 07:32:59 +11:00 · 2012-10-25 09:59:45 +11:00 · 2012-10-22 12:18:01 +11:00 · 2012-06-23 12:17:37 +10:00 · 2012-06-13 08:04:32 +10:00
1 changed files with 0 additions and 3 deletions
--- a/viewvc.spec
+++ b/viewvc.spec
@ -172,9 +172,6 @@ with decent performance when run under Apache.
 * Tue Jan 24 2012 Bojan Smojver <bojan@rexursive.com> - 1.1.13-1
 - bump up to 1.1.13

-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Fri Nov  4 2011 Bojan Smojver <bojan@rexursive.com> - 1.1.12-1
 - bump up to 1.1.12
Author	SHA1	Message	Date
Bojan Smojver	3896551469	Merge branch 'master' into f16	2012-10-31 17:28:40 +11:00
Bojan Smojver	bc65835dc9	Merge branch 'master' into f16 Conflicts: .gitignore sources viewvc.spec	2012-10-26 07:32:59 +11:00
Bojan Smojver	15d1127765	Bump up to 1.1.16.	2012-10-25 09:59:45 +11:00
Bojan Smojver	8a3319a327	Merge branch 'master' into f16	2012-10-22 12:18:01 +11:00
Bojan Smojver	3c2cfa2e90	Merge branch 'master' into f16	2012-06-23 12:17:37 +10:00
Bojan Smojver	36b358012a	Merge branch 'master' into f16	2012-06-13 08:04:32 +10:00
Bojan Smojver	4b5f7e5386	Merge branch 'master' into f16	2012-04-29 18:25:10 +10:00
Bojan Smojver	cb348eae96	Do not carry F-17 log entry.	2012-01-24 15:02:33 +11:00