diff options
| author | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 00:21:40 (GMT) |
|---|---|---|
| committer | Oli <olivier.belanger@umontreal.ca> | 2007-09-21 00:21:40 (GMT) |
| commit | 02d08e266a577f82b84a8fe0fbf8bfb83c2e7edc (patch) | |
| tree | 05b3714f8ae82ed2ba72357fffb7c66302c73eca /TamTamEdit.activity/Edit/MainWindow.py | |
| parent | 27ae244d089a93eb2d00631e5f4c17a54a5b41fd (diff) | |
oups...!
Diffstat (limited to 'TamTamEdit.activity/Edit/MainWindow.py')
| -rw-r--r-- | TamTamEdit.activity/Edit/MainWindow.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py index 3ab06c6..65aa464 100644 --- a/TamTamEdit.activity/Edit/MainWindow.py +++ b/TamTamEdit.activity/Edit/MainWindow.py @@ -2192,9 +2192,6 @@ class instrumentPalette( Popup ): category = widget.props.value instruments = self.getInstruments(category) self.loadInstrumentMenu(instruments) -<<<<<<< HEAD:TamTamEdit.activity/Edit/MainWindow.py - -======= def setCategory(self, category): self.categoryBox.set_active(self.categories.index(category)) @@ -2202,7 +2199,6 @@ class instrumentPalette( Popup ): def setInstrument(self, instrument): self.instrumentBox1.set_active(self.instruments.index(instrument)) ->>>>>>> 3f04e198e432714701cbdabf7ff244b29a960724:TamTamEdit.activity/Edit/MainWindow.py def loadInstrumentMenu(self, instruments): self.instrumentBox1.remove_all() for instrument in instruments: |