diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /opie-memoryapplet | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'opie-memoryapplet')
| -rw-r--r-- | opie-memoryapplet/opie-memoryapplet/memoryapplet.pro.patch | 34 | ||||
| -rw-r--r-- | opie-memoryapplet/opie-memoryapplet_1.1.7.bb | 0 | ||||
| -rw-r--r-- | opie-memoryapplet/opie-memoryapplet_cvs.bb | 0 |
3 files changed, 0 insertions, 34 deletions
diff --git a/opie-memoryapplet/opie-memoryapplet/memoryapplet.pro.patch b/opie-memoryapplet/opie-memoryapplet/memoryapplet.pro.patch deleted file mode 100644 index 532fd05e07..0000000000 --- a/opie-memoryapplet/opie-memoryapplet/memoryapplet.pro.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- memoryapplet/memoryapplet.pro.orig 2004-05-20 23:16:40.000000000 +0200 -+++ memoryapplet/memoryapplet.pro 2004-06-08 18:17:14.000000000 +0200 -@@ -1,14 +1,14 @@ - TEMPLATE = lib - CONFIG += qt plugin warn_on --HEADERS = ../../settings/sysinfo/graph.h \ -- ../../settings/sysinfo/load.h \ -- ../../settings/sysinfo/memory.h \ -+HEADERS = ../sysinfo/graph.h \ -+ ../sysinfo/load.h \ -+ ../sysinfo/memory.h \ - memorymeter.h \ - memorystatus.h \ - swapfile.h --SOURCES = ../../settings/sysinfo/graph.cpp \ -- ../../settings/sysinfo/load.cpp \ -- ../../settings/sysinfo/memory.cpp \ -+SOURCES = ../sysinfo/graph.cpp \ -+ ../sysinfo/load.cpp \ -+ ../sysinfo/memory.cpp \ - memorymeter.cpp \ - memorystatus.cpp \ - swapfile.cpp ---- memoryapplet/memorystatus.cpp.orig 2004-03-13 22:53:54.000000000 +0100 -+++ memoryapplet/memorystatus.cpp 2004-06-08 18:21:04.000000000 +0200 -@@ -18,7 +18,7 @@ - ** - **********************************************************************/ - #include "memorystatus.h" --#include "../../settings/sysinfo/memory.h" -+#include "../sysinfo/memory.h" - #include "swapfile.h" - - #include <qpainter.h> diff --git a/opie-memoryapplet/opie-memoryapplet_1.1.7.bb b/opie-memoryapplet/opie-memoryapplet_1.1.7.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/opie-memoryapplet/opie-memoryapplet_1.1.7.bb +++ /dev/null diff --git a/opie-memoryapplet/opie-memoryapplet_cvs.bb b/opie-memoryapplet/opie-memoryapplet_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/opie-memoryapplet/opie-memoryapplet_cvs.bb +++ /dev/null |