- Add man3/3proxy.cfg.3 man (BZ#648204).

- Gone explicit man gzip - leave it for rpm.
dist-git conversion
2010-11-04 23:24:00 +03:00 · 2010-07-28 08:45:03 +00:00 · 2010-05-30 18:49:43 +00:00 · 2010-03-15 14:17:02 +00:00 · 2009-11-28 22:35:32 +00:00 · 2009-11-25 23:49:52 +00:00
1 changed files with 4 additions and 0 deletions
--- a/3proxy.cfg
+++ b/3proxy.cfg
@ -175,4 +175,8 @@ admin
 # now we needn't any root rights. We can chroot and setgid/setuid.


+<<<<<<< HEAD
+###$Id: 3proxy.cfg,v 1.1 2009/08/27 20:43:43 hubbitus Exp $#######
+=======
 ###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######
+>>>>>>> origin/master
Author	SHA1	Message	Date
Pavel Alexeev (aka Pahan-Hubbitus)	562ee66f2d	- Add man3/3proxy.cfg.3 man (BZ#648204). - Gone explicit man gzip - leave it for rpm.	2010-11-04 23:24:00 +03:00
Fedora Release Engineering	04b959c713	dist-git conversion	2010-07-28 08:45:03 +00:00
Pavel Alexeev	a26c67ea44	Correct path to config file in man (BUG#596087) add Patch0: 3proxy-0.6.1-config-path.patch	2010-05-30 18:49:43 +00:00
Pavel Alexeev	298f285f3f	- Update to version 0.6.1 - In NM event processing replace service restart to condrestart - BZ#572662	2010-03-15 14:17:02 +00:00
Pavel Alexeev	48564a0e50	Again new init-script for Fix BZ#533144 :).	2009-11-28 22:35:32 +00:00
Bill Nottingham	d9e1f06361	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-25 23:49:52 +00:00
Pavel Alexeev	2b408f5933	- Fix BZ#533144: - Add reload section to service file, fix stop. - Add %%{_sysconfdir}/NetworkManager/dispatcher.d/40-%%{name} (Thanks to Pankaj Pandey) - Include man-files. - Add Requires: initscripts as owner directory %%{_sysconfdir}/NetworkManager/dispatcher.d/	2009-11-09 12:55:15 +00:00
Pavel Alexeev	5de2e3862b	Initial import 3proxy into Fedora	2009-08-27 20:43:44 +00:00
Kevin Fenzi	6c3b6c72bb	Initialize branch EL-5 for 3proxy	2009-08-26 22:17:29 +00:00