From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <systemtap-cvs-return-2413-listarch-systemtap-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 4160 invoked by alias); 20 Aug 2007 14:04:00 -0000
Received: (qmail 3969 invoked by uid 9156); 20 Aug 2007 14:03:56 -0000
Date: Mon, 20 Aug 2007 14:04:00 -0000
Message-ID: <20070820140356.3967.qmail@sourceware.org>
From: dsmith@sourceware.org
To: systemtap-cvs@sourceware.org
Subject: src ChangeLog main.cxx
Mailing-List: contact systemtap-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <systemtap-cvs.sourceware.org>
List-Subscribe: <mailto:systemtap-cvs-subscribe@sourceware.org>
List-Post: <mailto:systemtap-cvs@sourceware.org>
List-Help: <mailto:systemtap-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: systemtap-cvs-owner@sourceware.org
List-Archive: <http://sourceware.org/ml/systemtap-cvs/>
X-SW-Source: 2007-q3/txt/msg00192.txt.bz2

CVSROOT:	/cvs/systemtap
Module name:	src
Changes by:	dsmith@sourceware.org	2007-08-20 14:03:56

Modified files:
	.              : ChangeLog main.cxx 

Log message:
	2007-08-20  David Smith  <dsmith@redhat.com>
	
	From Lai Jiangshan <laijs@cn.fujitsu.com>
	* main.cxx (main): Make sure the '-c' and '-x' options can't be
	specified together.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/src/ChangeLog.diff?cvsroot=systemtap&r1=1.657&r2=1.658
http://sourceware.org/cgi-bin/cvsweb.cgi/src/main.cxx.diff?cvsroot=systemtap&r1=1.76&r2=1.77