[Tux4kids-commits] r655 - tuxtype/trunk/data/images/keyboard

[sreyas-guest at alioth.debian.org]

Author: sreyas-guest
Date: 2008-08-19 07:52:53 +0000 (Tue, 19 Aug 2008)
New Revision: 655

Modified:
   tuxtype/trunk/data/images/keyboard/Makefile.am
Log:
keyboard makefile fixed

Modified: tuxtype/trunk/data/images/keyboard/Makefile.am
===================================================================
--- tuxtype/trunk/data/images/keyboard/Makefile.am	2008-08-18 22:51:48 UTC (rev 654)
+++ tuxtype/trunk/data/images/keyboard/Makefile.am	2008-08-19 07:52:53 UTC (rev 655)
@@ -135,5 +135,136 @@
   keyboard-us.eps \
   keyboard-us.png \
   larrow.png \
+<<<<<<< .mine
+  space.png \
+  rarrow.png\
+	keyboard_B05.png \
+	keyboard_C11.png \
+	keyboard_E04.png \
+	keyboard_A00.png \
+	keyboard_B06.png \
+	keyboard_C12.png \
+	keyboard_E05.png \
+	keyboard_A01.png \
+	keyboard_B07.png \
+	keyboard_E06.png \
+	keyboard_A02.png \
+	keyboard_B08.png \
+	keyboard_D00.png \
+	keyboard_E07.png \
+	keyboard_A03.png \
+	keyboard_B09.png \
+	keyboard_D01.png \
+	keyboard_A04.png \
+	keyboard_B10.png \
+	keyboard_D02.png \
+	keyboard_None.png \
+	keyboard_A05.png \
+	keyboard_B11.png \
+	keyboard_D03.png \
+	keyboard_A06.png \
+	keyboard_B12.png \
+	keyboard_D04.png \
+	keyboard_A07.png \
+	keyboard_B13.png \
+	keyboard_D05.png \
+	keyboard_A08.png \
+	keyboard_C00.png \
+	keyboard_D06.png \
+	keyboard_A09.png \
+	keyboard_C01.png \
+	keyboard_D07.png \
+	keyboard_A10.png \
+	keyboard_C02.png \
+	keyboard_D08.png \
+	keyboard_A11.png \
+	keyboard_C03.png \
+	keyboard_D09.png \
+	keyboard_A12.png \
+	keyboard_C04.png \
+	keyboard_D10.png \
+	keyboard_A13.png \
+	keyboard_C05.png \
+	keyboard_D11.png \
+	keyboard_B00.png \
+	keyboard_C06.png \
+	keyboard_D12.png \
+	keyboard_B01.png \
+	keyboard_C07.png \
+	keyboard_E00.png \
+	keyboard_B02.png \
+	keyboard_C08.png \
+	keyboard_E01.png \
+	keyboard_B03.png \
+	keyboard_C09.png \
+	keyboard_E02.png \
+	keyboard_B04.png \
+	keyboard_C10.png \
+	keyboard_E03.png \
+	keyboardN_B05.png \
+	keyboardN_C11.png \
+	keyboardN_E04.png \
+	keyboardN_A00.png \
+	keyboardN_B06.png \
+	keyboardN_C12.png \
+	keyboardN_E05.png \
+	keyboardN_A01.png \
+	keyboardN_B07.png \
+	keyboardN_E06.png \
+	keyboardN_A02.png \
+	keyboardN_B08.png \
+	keyboardN_D00.png \
+	keyboardN_E07.png \
+	keyboardN_A03.png \
+	keyboardN_B09.png \
+	keyboardN_D01.png \
+	keyboardN_A04.png \
+	keyboardN_B10.png \
+	keyboardN_D02.png \
+	keyboardN_None.png \
+	keyboardN_A05.png \
+	keyboardN_B11.png \
+	keyboardN_D03.png \
+	keyboardN_A06.png \
+	keyboardN_B12.png \
+	keyboardN_D04.png \
+	keyboardN_A07.png \
+	keyboardN_B13.png \
+	keyboardN_D05.png \
+	keyboardN_A08.png \
+	keyboardN_C00.png \
+	keyboardN_D06.png \
+	keyboardN_A09.png \
+	keyboardN_C01.png \
+	keyboardN_D07.png \
+	keyboardN_A10.png \
+	keyboardN_C02.png \
+	keyboardN_D08.png \
+	keyboardN_A11.png \
+	keyboardN_C03.png \
+	keyboardN_D09.png \
+	keyboardN_A12.png \
+	keyboardN_C04.png \
+	keyboardN_D10.png \
+	keyboardN_A13.png \
+	keyboardN_C05.png \
+	keyboardN_D11.png \
+	keyboardN_B00.png \
+	keyboardN_C06.png \
+	keyboardN_D12.png \
+	keyboardN_B01.png \
+	keyboardN_C07.png \
+	keyboardN_E00.png \
+	keyboardN_B02.png \
+	keyboardN_C08.png \
+	keyboardN_E01.png \
+	keyboardN_B03.png \
+	keyboardN_C09.png \
+	keyboardN_E02.png \
+	keyboardN_B04.png \
+	keyboardN_C10.png \
+	keyboardN_E03.png
+=======
   rarrow.png \
   space.png
+>>>>>>> .r654