[oprof-cvs] CVS: oprofile/libutil op_file.c,1.12.2.1,1.12.2.2

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/libutil
In directory sc8-pr-cvs1:/tmp/cvs-serv16495/libutil

Modified Files:
      Tag: BRANCH_CALLGRAPH
	op_file.c 
Log Message:
merge from HEAD


Index: op_file.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libutil/op_file.c,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -p -d -r1.12.2.1 -r1.12.2.2
--- op_file.c	11 Aug 2003 21:18:40 -0000	1.12.2.1
+++ op_file.c	23 Aug 2003 16:47:10 -0000	1.12.2.2
@@ -206,7 +206,7 @@ static char * op_simplify_pathname(char 
 /**
  * op_relative_to_absolute_path - translate relative path to absolute path.
  * @param path  path name
- * @param base_dir  optionnal base directory, if %NULL getcwd() is used
+ * @param base_dir  optional base directory, if %NULL getcwd() is used
  * to get the base directory.
  *
  * prepend base_dir or the result of getcwd if the path is not absolute.