This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ur scripts/duration scripts/duration | |
--- scripts/duration 2012-03-19 19:08:42.000000000 +0100 | |
+++ scripts/duration 2012-12-19 15:30:29.000000000 +0100 | |
@@ -14,24 +14,24 @@ | |
#// | |
#//////////////////////////////////////////////////////////////////////////// | |
-BLACK="\e[1;30m" | |
-DARK_GREY="\e[1;30m" | |
-BLUE="\e[1;34m" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ru matlab/makefile matlab/makefile | |
--- matlab/makefile 2011-05-06 11:35:59.000000000 +0200 | |
+++ matlab/makefile 2013-08-28 18:42:01.000000000 +0200 | |
@@ -31,7 +31,7 @@ | |
INSTALL_DIR = /usr | |
-MATLAB_DIR = $(INSTALL_DIR)/local/matlab | |
+MATLAB_DIR = $(INSTALL_DIR)/matlab | |
MAN_BASE = $(INSTALL_DIR)/man |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u a/icmake/install b/icmake/install | |
--- a/icmake/install 2014-01-18 04:08:06.000000000 +0100 | |
+++ b/icmake/install 2014-01-18 04:08:23.000000000 +0100 | |
@@ -29,7 +29,7 @@ | |
if (what == "programs") | |
{ | |
md(where + BIN); | |
- run("cp " + g_install + BIN + "/* " + where + BIN); | |
+ run("cp -r " + g_install + BIN + "/* " + where + BIN); | |
run("chmod +x " + where + BIN + "/yodlstriproff"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u a/CCache/Makefile.in b/CCache/Makefile.in | |
--- a/CCache/Makefile.in 2014-01-18 06:35:52.000000000 +0100 | |
+++ b/CCache/Makefile.in 2014-01-18 06:43:42.000000000 +0100 | |
@@ -28,27 +28,27 @@ | |
all: $(PACKAGE_NAME)$(EXEEXT) | |
# Note that HTML documentation is actually generated and used from the main SWIG documentation Makefile | |
-docs: $(PACKAGE_NAME).1 web/ccache-man.html | |
+docs: ccache.man web/ccache-man.html | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u a/build b/build | |
--- a/build 2014-01-19 21:15:43.000000000 +0100 | |
+++ b/build 2014-01-19 21:14:44.000000000 +0100 | |
@@ -1,4 +1,4 @@ | |
-#!/usr/bin/icmake -qt/tmp/yodl | |
+#!/usr/bin/env icmake -qt/tmp/yodl | |
#include "VERSION" | |
#include "INSTALL.im" | |
@@ -59,7 +59,7 @@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u cmake/Modules/FindQwt.cmake cmake/Modules/FindQwt.cmake | |
--- cmake/Modules/FindQwt.cmake 2014-01-28 09:34:40.000000000 +0100 | |
+++ cmake/Modules/FindQwt.cmake 2014-01-28 09:36:35.000000000 +0100 | |
@@ -12,6 +12,7 @@ | |
PATHS | |
/usr/local/include/qwt-qt4 | |
/usr/local/include/qwt | |
+ /usr/local/lib/qwt.framework/Headers | |
/usr/include/qwt6 | |
/usr/include/qwt-qt4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u cmake/Modules/FindICE-3.5.cmake cmake/Modules/FindICE-3.5.cmake | |
--- cmake/Modules/FindICE-3.5.cmake 2014-01-28 10:26:42.000000000 +0100 | |
+++ cmake/Modules/FindICE-3.5.cmake 2014-01-28 10:28:26.000000000 +0100 | |
@@ -43,12 +43,6 @@ | |
set(ICE_LIBRARY ) | |
-if(APPLE) | |
- set(ICE_LIB_PREFIX "Zeroc") | |
-else() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u gr-qtgui/lib/spectrumdisplayform.ui gr-qtgui/lib/spectrumdisplayform.ui | |
--- gr-qtgui/lib/spectrumdisplayform.ui 2014-01-29 01:06:55.000000000 +0100 | |
+++ gr-qtgui/lib/spectrumdisplayform.ui 2014-01-29 01:07:17.000000000 +0100 | |
@@ -506,7 +506,6 @@ | |
</layout> | |
</widget> | |
<layoutdefault spacing="6" margin="11"/> | |
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> | |
<customwidgets> | |
<customwidget> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | |
index 3b31191..517f69f 100644 | |
--- gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | |
+++ gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | |
@@ -269,6 +269,7 @@ signals: | |
protected slots: | |
virtual void legendEntryChecked(QwtPlotItem *plotItem, bool on); | |
+ virtual void legendEntryChecked(const QVariant &plotItem, bool on, int index); | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git src/process_removeartefacts/process_removeartefacts.cpp src/process_removeartefacts/process_removeartefacts.cpp | |
index 13458f7..37bf8bc 100644 | |
--- src/process_removeartefacts/process_removeartefacts.cpp | |
+++ src/process_removeartefacts/process_removeartefacts.cpp | |
@@ -34,7 +34,7 @@ | |
using namespace std; | |
-main(int argc,char *argv[]) | |
+int main(int argc,char *argv[]) |
OlderNewer