Merge branch 'klibc/1.15-dev'
authorAlexey Gladkov <legion@altlinux.org>
Mon, 8 Jun 2009 11:26:22 +0000 (15:26 +0400)
committerAlexey Gladkov <legion@altlinux.org>
Mon, 8 Jun 2009 11:26:22 +0000 (15:26 +0400)
Conflicts:
src/loadkeys.c

1  2 
src/dumpkeys.c
src/loadkeys.c
src/loadkeys.y

diff --cc src/dumpkeys.c
Simple merge
diff --cc src/loadkeys.c
Simple merge
diff --cc src/loadkeys.y
Simple merge