diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:19:08 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:19:08 +0000 |
commit | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (patch) | |
tree | 6f5c507ceb9741a5598d2531b980c2f6d7ddf7f0 /packages/linux-input | |
parent | edbb148535f63e58a8e10ed5c68b7aecb983602e (diff) | |
parent | ce0af9851e5a2231b9ed9fcfecfd10cc4b7794c3 (diff) |
explicit_merge of '85da89c673cc2faec29d5ea692e6e7638f4c1b5e'
and '5f32961e5d0f4132f4513cbeac7fe59dc5ae5315'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'packages/linux-input')
-rw-r--r-- | packages/linux-input/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/linux-input/files/makefile.patch (renamed from packages/linux-input/makefile.patch) | 0 | ||||
-rw-r--r-- | packages/linux-input/files/serio.h (renamed from packages/linux-input/serio.h) | 0 | ||||
-rw-r--r-- | packages/linux-input/files/snes232.patch (renamed from packages/linux-input/snes232.patch) | 0 | ||||
-rw-r--r-- | packages/linux-input/linux-input_cvs.bb | 3 |
5 files changed, 1 insertions, 2 deletions
diff --git a/packages/linux-input/files/.mtn2git_empty b/packages/linux-input/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux-input/files/.mtn2git_empty diff --git a/packages/linux-input/makefile.patch b/packages/linux-input/files/makefile.patch index 6499372f83..6499372f83 100644 --- a/packages/linux-input/makefile.patch +++ b/packages/linux-input/files/makefile.patch diff --git a/packages/linux-input/serio.h b/packages/linux-input/files/serio.h index 82670ed3f5..82670ed3f5 100644 --- a/packages/linux-input/serio.h +++ b/packages/linux-input/files/serio.h diff --git a/packages/linux-input/snes232.patch b/packages/linux-input/files/snes232.patch index 95523e4569..95523e4569 100644 --- a/packages/linux-input/snes232.patch +++ b/packages/linux-input/files/snes232.patch diff --git a/packages/linux-input/linux-input_cvs.bb b/packages/linux-input/linux-input_cvs.bb index c377a0a397..ca10e1c21b 100644 --- a/packages/linux-input/linux-input_cvs.bb +++ b/packages/linux-input/linux-input_cvs.bb @@ -1,6 +1,5 @@ -SECTION = "unknown" PR = "r2" -PV = "0.0cvs${CVSDATE}" +PV = "0.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@cvs1.sourceforge.net/cvsroot/linuxconsole;module=ruby \ file://serio.h \ |