[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kjsembed/kjscmd
From:       Gregory S. Hayes <syncomm () gmail ! com>
Date:       2006-02-04 14:57:43
Message-ID: 1139065063.473081.30319.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 505687 by syncomm:

conflict resolution


 M  +1 -1      Makefile.am  
 M  +1 -1      kjscmd.cpp  


--- trunk/KDE/kdelibs/kjsembed/kjscmd/Makefile.am #505686:505687
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kjsembed $(all_includes)
+INCLUDES = -I$(top_srcdir)/kjsembed/kjsembed $(all_includes)
 
 bin_PROGRAMS = kjscmd 
 
--- trunk/KDE/kdelibs/kjsembed/kjscmd/kjscmd.cpp #505686:505687
@@ -24,7 +24,7 @@
 #include <kjs/interpreter.h>
 #include <kjs/ustring.h>
 
-#include "kjsembed/kjsembed.h"
+#include "kjsembed.h"
 #include "../kjsembed/global.h"
 
 #include <QTime>
[prev in list] [next in list] [prev in thread] [next in thread]