From 124206593aaef274a5dcf8cbb689c0eb3544800b Mon Sep 17 00:00:00 2001
From: Walther Neuper <wneuper@localhost.(none)>
Date: Mon, 17 May 2010 13:51:29 +0000
Subject: Collation.data -> gitignore

---
diff --git a/.gitignore b/.gitignore
index 370cdf6..d62ff0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 *.pyc
 ReckonPrimer.activity/data/protocol.txt
+data/Collection.data
diff --git a/ReckonPrimer.activity/data/Collection.data b/ReckonPrimer.activity/data/Collection.data
deleted file mode 100644
index 9dcd015..0000000
--- a/ReckonPrimer.activity/data/Collection.data
+++ /dev/null
@@ -1,890 +0,0 @@
-(icollection
-Collection
-p0
-(dp1
-S'_data'
-p2
-(lp3
-(icollection
-Collection
-p4
-(dp5
-g2
-(lp6
-(icollection
-Collection
-p7
-(dp8
-g2
-(lp9
-<<<<<<< HEAD:ReckonPrimer.activity/data/Collection.data
-sS'_pic'
-p10
-NsS'_title'
-p11
-S'Add Sub: + & -'
-p12
-sS'_description'
-p13
-S"hier sind alle 1x1-Reihen mit 'in'"
-p14
-sba(icollection
-Collection
-p15
-(dp16
-g2
-(lp17
-(itask
-Task
-p18
-(dp19
-S'_eval'
-p20
-(lp21
-sS'_sett'
-p22
-(dp23
-S'min'
-p24
-I0
-sS'=input'
-p25
-(lp26
-I1
-aI3
-aI5
-asS'cut-max'
-p27
-I01
-sS'_+_=_'
-p28
-I01
-sS'title'
-p29
-S'template exaddsimp'
-p30
-sS'MAX'
-p31
-I30
-sS'+'
-p32
-I01
-sS'MIN'
-p33
-I20
-sS'descript'
-p34
-S'addition and subtraction without carry,                             i.e. without passing the 10 barrier. '
-p35
-sS'input='
-p36
-(lp37
-I1
-aI3
-aI5
-asS'topic'
-p38
-S'addsub_simp'
-p39
-sS'calclines'
-p40
-I1
-sS'-'
-p41
-I01
-sS'max'
-p42
-I1
-sS'_=_+_'
-p43
-I00
-sS'shuffle'
-p44
-I01
-sS'icon'
-p45
-Nssba(itask
-Task
-p46
-(dp47
-g20
-(lp48
-sg22
-(dp49
-g24
-I2
-sg27
-I01
-sS'newline'
-p50
-I01
-sg29
-S'template expassten'
-p51
-sS'shuffle_all'
-p52
-I00
-sg31
-I150
-sg32
-I01
-sg33
-I10
-sg34
-S'addition and subtraction with carry,                             i.e. with passing the 10 barrier. '
-p53
-sg38
-S'passten'
-p54
-sg40
-I1
-sg41
-I00
-sg42
-I2
-sS'input'
-p55
-(lp56
-I3
-asS'shuffle_inner'
-p57
-I00
-sg45
-Nssba(itask
-Task
-p58
-(dp59
-g20
-(lp60
-sg22
-(dp61
-g24
-I2
-sg42
-I2
-sS'*'
-p62
-I00
-sg29
-S'template extimesdiv'
-p63
-sg52
-I00
-sg31
-I50
-sS'*commute'
-p64
-I00
-sg33
-I10
-sg34
-S'multiplication, division and "in"                             from 2 to 19 and 20 to 190. '
-p65
-sS'vadd'
-p66
-I0
-sg38
-S'times_div'
-p67
-sS'factors'
-p68
-(lp69
-I2
-aI4
-asg57
-I00
-sg40
-I1
-sS'in'
-p70
-I00
-sg27
-I01
-sS':'
-p71
-I01
-sS'remainder'
-p72
-I00
-sS'vmult'
-p73
-I1
-sg45
-Nssbasg10
-Nsg11
-S'Times Division: x & in'
-p74
-sg13
-g14
-sba(icollection
-Collection
-p75
-(dp76
-g2
-(lp77
-sg10
-Nsg11
-S'Pass Ten: ->10'
-p78
-sg13
-g14
-sbasg10
-Nsg11
-S'Templates'
-p79
-sg13
-S'Hier finden Sie alle verf\xc3\xbcgbaren Templates'
-p80
-sbasg10
-Nsg11
-S'root = invisible node'
-p81
-sg13
-S'aber ben\xc3\xb6tigt zum richtigen speichern/lesen'
-p82
-=======
-(icollection
-Collection
-p10
-(dp11
-g2
-(lp12
-(itask
-Task
-p13
-(dp14
-S'_eval'
-p15
-(lp16
-sS'_sett'
-p17
-(dp18
-S'cut-max'
-p19
-I01
-sS':'
-p20
-I00
-sS'icon'
-p21
-NsS'title'
-p22
-S'2-er Reihe'
-p23
-sS'shuffle_all'
-p24
-I01
-sS'MAX'
-p25
-I50
-sS'*commute'
-p26
-I00
-sS'*'
-p27
-I01
-sS'descript'
-p28
-S'settings: series (2,4,8 is possible!) of *, "in" and : with remainder, series 11..19 (left bar),series 10..90 (right long bar), separate shuffling or operands.'
-p29
-sS'factors'
-p30
-(lp31
-I2
-asS'topic'
-p32
-S'times_div'
-p33
-sS'MIN'
-p34
-I10
-sS'in'
-p35
-I00
-sS'vadd'
-p36
-I0
-sS'shuffle_inner'
-p37
-I01
-sS'remainder'
-p38
-I00
-sS'vmult'
-p39
-I1
-sS'calclines'
-p40
-I1
-ssba(itask
-Task
-p41
-(dp42
-g15
-(lp43
-sg17
-(dp44
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'3-er Reihe'
-p45
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp46
-I3
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssba(itask
-Task
-p47
-(dp48
-g15
-(lp49
-sg17
-(dp50
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'4-er Reihe'
-p51
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp52
-I4
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssba(itask
-Task
-p53
-(dp54
-g15
-(lp55
-sg17
-(dp56
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'5-er Reihe'
-p57
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp58
-I5
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssba(itask
-Task
-p59
-(dp60
-g15
-(lp61
-sg17
-(dp62
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'6-er Reihe'
-p63
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp64
-I6
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssba(itask
-Task
-p65
-(dp66
-g15
-(lp67
-sg17
-(dp68
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'7-er Reihe'
-p69
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp70
-I7
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssba(itask
-Task
-p71
-(dp72
-g15
-(lp73
-sg17
-(dp74
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'8-er Reihe'
-p75
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp76
-I8
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssba(itask
-Task
-p77
-(dp78
-g15
-(lp79
-sg17
-(dp80
-g19
-I01
-sg20
-I00
-sg21
-Nsg22
-S'9-er Reihe'
-p81
-sg24
-I01
-sg25
-I50
-sg26
-I00
-sg27
-I01
-sg28
-g29
-sg30
-(lp82
-I9
-asg32
-g33
-sg34
-I10
-sg35
-I00
-sg36
-I0
-sg37
-I01
-sg38
-I00
-sg39
-I1
-sg40
-I1
-ssbasS'_pic'
-p83
-NsS'_title'
-p84
-S"Einzelne Reihen . und 'in'"
-p85
-sS'_description'
-p86
-S' '
-p87
-sba(icollection
-Collection
-p88
-(dp89
-g2
-(lp90
-sg83
-Nsg84
-S'Mehrere Reihen .'
-p91
-sg86
-S'Wir ueben zusammengehoerende Reihen.'
-p92
-sba(icollection
-Collection
-p93
-(dp94
-g2
-(lp95
-sg83
-Nsg84
-S'Alle Reihen gemischt'
-p96
-sg86
-g87
-sbasg83
-Nsg84
-S"Uebungen . und 'in' "
-p97
-sg86
-g87
-sba(icollection
-Collection
-p98
-(dp99
-g2
-(lp100
-sg83
-Nsg84
-S'Uebungen :'
-p101
-sg86
-g87
-sba(icollection
-Collection
-p102
-(dp103
-g2
-(lp104
-sg83
-Nsg84
-S'Uebungen + und - '
-p105
-sg86
-g87
-sbasg83
-Nsg84
-S'Praxis Volksschule'
-p106
-sg86
-S'Rechenuebungen fuer die 1. und 2.Klasse, festgelegt am 16.Dez.09 mit Nina Jaklitsch und Arndt Stoeckl .'
-p107
-sba(icollection
-Collection
-p108
-(dp109
-g2
-(lp110
-sg83
-Nsg84
-S'Schoenberger'
-p111
-sg86
-S'Most efficient introduction to the four basic arithmetic                operations as taught by Igo Schoenberger in the last century                in Upper Austria.'
-p112
-sba(icollection
-Collection
-p113
-(dp114
-g2
-(lp115
-(itask
-Task
-p116
-(dp117
-g15
-(lp118
-sg17
-(dp119
-S'min'
-p120
-I0
-sS'=input'
-p121
-(lp122
-I1
-aI3
-aI5
-asg19
-I01
-sS'_+_=_'
-p123
-I01
-sg22
-S'Template: + - within 10'
-p124
-sg25
-I100
-sS'+'
-p125
-I01
-sg34
-I20
-sg28
-S'settings: range of result, input at 3 positions, swap around ='
-p126
-sS'input='
-p127
-(lp128
-I1
-aI3
-aI5
-asg32
-S'addsub_simp'
-p129
-sg40
-I1
-sS'-'
-p130
-I01
-sS'max'
-p131
-I1
-sS'_=_+_'
-p132
-I00
-sS'shuffle'
-p133
-I00
-sg21
-Nssba(itask
-Task
-p134
-(dp135
-g15
-(lp136
-sg17
-(dp137
-g120
-I2
-sg19
-I01
-sS'newline'
-p138
-I01
-sg22
-S'Template: + - passing the 10 barrier'
-p139
-sg24
-I00
-sg25
-I150
-sg125
-I01
-sg34
-I10
-sg28
-S'settings: range of 1st operand, input left and right from =, input intermediate result, separate shuffling of operands.'
-p140
-sg32
-S'passten'
-p141
-sg40
-I1
-sg130
-I00
-sg131
-I2
-sS'input'
-p142
-(lp143
-I3
-asg37
-I00
-sg21
-Nssba(itask
-Task
-p144
-(dp145
-g15
-(lp146
-sg17
-(dp147
-g30
-(lp148
-I2
-aI4
-asg37
-I00
-sg27
-I00
-sg22
-S'Template: * : "in" series'
-p149
-sg24
-I00
-sg25
-I50
-sg26
-I00
-sg34
-I10
-sg28
-g29
-sg36
-I0
-sg32
-g33
-sg40
-I1
-sg35
-I00
-sg19
-I01
-sg20
-I01
-sg38
-I00
-sg39
-I1
-sg21
-Nssbasg83
-Nsg84
-S'Templates'
-p150
-sg86
-S'These are the (classes of) exercises all others are derived                from. Thus, please, do not deletem them.                For testing exercises disabling of @ is recommended.'
-p151
-sbasg83
-Nsg84
-S'root = invisible node'
-p152
-sg86
-S'required by tree structure'
-p153
->>>>>>> wintersw:ReckonPrimer.activity/data/Collection.data
-sb.
\ No newline at end of file
--
cgit v0.9.1