diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-29 14:52:10 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-29 14:52:10 +0000 |
| commit | 3a14317fbe2b23d8ac5a7e4e0bca6ec6c891df20 (patch) | |
| tree | d7b6f450045fb5568d2f31008bd117070b7bd3f6 /packages/openmoko2 | |
| parent | 2d539e8f1c52a81e7fbaaf9c5f1282aed158b273 (diff) | |
| parent | 1230116f8d9c7e4a6c5ee6cdbaf617caa53d0ce9 (diff) | |
merge of 'e24780d148b92ff2ae1162d9886e4a7befaf60da'
and 'eb765fb131a4212a65be90317c082f34cd4b4a41'
Diffstat (limited to 'packages/openmoko2')
| -rw-r--r-- | packages/openmoko2/openmoko-terminal2/openmoko-terminal.png | bin | 11078 -> 11860 bytes | |||
| -rw-r--r-- | packages/openmoko2/openmoko-terminal2_1.0.0.bb | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png Binary files differindex 56e8e59628..3b383c10e6 100644 --- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png +++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index cff759edd6..afb0592050 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,10 +1,9 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r4" - RCONFLICTS = "openmoko-terminal" RREPLACES = "openmoko-terminal" +PR = "r5" inherit openmoko2 |
