[fuse-emulator-cvs] SF.net SVN: fuse-emulator:[4979] branches/fuse-utils_1_1_0-branch

[<fr...@us...>]

Revision: 4979
          http://sourceforge.net/p/fuse-emulator/code/4979
Author:   fredm
Date:     2013-05-21 12:26:32 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Merge r4976->4977 from trunk.

Revision Links:
--------------
    http://sourceforge.net/p/fuse-emulator/code/4976

Modified Paths:
--------------
    branches/fuse-utils_1_1_0-branch/configure.ac
    branches/fuse-utils_1_1_0-branch/hacking/ChangeLog
    branches/fuse-utils_1_1_0-branch/man/fmfconv.1

Property Changed:
----------------
    branches/fuse-utils_1_1_0-branch/

Index: branches/fuse-utils_1_1_0-branch
===================================================================
--- branches/fuse-utils_1_1_0-branch	2013-05-21 12:03:35 UTC (rev 4978)
+++ branches/fuse-utils_1_1_0-branch	2013-05-21 12:26:32 UTC (rev 4979)

Property changes on: branches/fuse-utils_1_1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,4 ##
 /branches/fuse-utils_1_0_0-branch:4184-4219
 /branches/ntsc-2009-04-11/fuse-utils:4000-4147
 /branches/opus-20090722/fuse-utils:4046-4059
-/trunk/fuse-utils:4939,4945,4952,4956
+/trunk/fuse-utils:4939,4945-4977
\ No newline at end of property
Modified: branches/fuse-utils_1_1_0-branch/configure.ac
===================================================================
--- branches/fuse-utils_1_1_0-branch/configure.ac	2013-05-21 12:03:35 UTC (rev 4978)
+++ branches/fuse-utils_1_1_0-branch/configure.ac	2013-05-21 12:26:32 UTC (rev 4979)
@@ -70,7 +70,7 @@
 CXXFLAGS="$CXXFLAGS -I$withval/include";
 LDFLAGS="$LDFLAGS -L$withval/lib",
 if test "$prefix" != "NONE"; then
-  CPPFLAGS="$CPPLAGS -I$prefix/include";
+  CPPFLAGS="$CPPFLAGS -I$prefix/include";
   CXXFLAGS="$CXXFLAGS -I$prefix/include";
   LDFLAGS="$LDFLAGS -L$prefix/lib"
 fi)

Modified: branches/fuse-utils_1_1_0-branch/hacking/ChangeLog
===================================================================
--- branches/fuse-utils_1_1_0-branch/hacking/ChangeLog	2013-05-21 12:03:35 UTC (rev 4978)
+++ branches/fuse-utils_1_1_0-branch/hacking/ChangeLog	2013-05-21 12:26:32 UTC (rev 4979)
@@ -416,3 +416,6 @@
 20130516 ChangeLog: update date in main changelog.
 20130517 README: update date for 1.1 release.
 20130518 man/fmfconv.1: update date for 1.1 release (Sergio).
+20130520 configure.ac: fix typo in the CPPFLAGS variable name (patch #310)
+         (Alberto).
+20130520 man/fmfconv.1: fix syntax error (patch #311) (Alberto).

Modified: branches/fuse-utils_1_1_0-branch/man/fmfconv.1
===================================================================
--- branches/fuse-utils_1_1_0-branch/man/fmfconv.1	2013-05-21 12:03:35 UTC (rev 4978)
+++ branches/fuse-utils_1_1_0-branch/man/fmfconv.1	2013-05-21 12:26:32 UTC (rev 4979)
@@ -43,7 +43,6 @@
 .SH DESCRIPTION
 fmfconv is a Fuse movie file converter. It can convert .fmf files to
 any video file format known by FFMPEG.
-...
 .\"
 .\"------------------------------------------------------------------
 .\"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.