diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-07 23:11:00 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-07 23:11:00 +0100 |
| commit | 4169595397ba962f230033b921964cae1629736d (patch) | |
| tree | 94e0a25a1c6b32e8b2d475ba3ab02d7ba7eaf075 /src/Daemon/Daemon.cpp | |
| parent | 8569385a9a7f679e32febafda8e8bdcfdf0fa64a (diff) | |
| parent | 2ce0dac4d05ce449f4d054c4725a852a43aab428 (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src/Daemon/Daemon.cpp')
| -rw-r--r-- | src/Daemon/Daemon.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 9921423..704d2c3 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - +*/ #include <syslog.h> #include <pthread.h> #include <resolv.h> /* res_init */ |