[OMPT-svn-commit] SF.net SVN: modplug:[272] trunk/OpenMPT/mptrack/mptrack.rc

[<rel...@us...>]

Revision: 272
          http://modplug.svn.sourceforge.net/modplug/?rev=272&view=rev
Author:   relabsoluness
Date:     2009-06-17 18:44:27 +0000 (Wed, 17 Jun 2009)

Log Message:
-----------
? Misc: Fixed a merge bug from last commit.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2009-06-17 17:50:41 UTC (rev 271)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2009-06-17 18:44:27 UTC (rev 272)
@@ -146,7 +146,7 @@
             MENUITEM "Cleanup S&ong",               ID_CLEANUP_SONG
             MENUITEM "Remove &All Instruments",     ID_INSTRUMENTS_REMOVEALL
             MENUITEM "Cleanup &Plugins",            ID_CLEANUP_PLUGS
-			MENUITEM "Co&mpo Cleanup",				ID_CLEANUP_COMPO
+            MENUITEM "Co&mpo Cleanup",              ID_CLEANUP_COMPO
         END
         MENUITEM SEPARATOR
         MENUITEM "&Find\tCtrl+F",               ID_EDIT_FIND
@@ -2051,7 +2051,6 @@
         BOTTOMMARGIN, 104
     END
 
-	ID_CLEANUP_COMPO		"Reset attributes to defaults (useful for creating sample packs)\Compo Cleanup"
     IDD_CONTROL_INSTRUMENTS, DIALOG
     BEGIN
         RIGHTMARGIN, 522
@@ -2500,6 +2499,7 @@
     ID_PATTERN_PLAYROW      "Play current row\nPlay Row"
     ID_IMPORT_MIDILIB       "Defines the default MIDI library used when importing MIDI files"
     ID_CLEANUP_REARRANGE    "Rearrange all patterns so that they are sorted in the order list\nRearrange Patterns"
+    ID_CLEANUP_COMPO        "Reset attributes to defaults (useful for creating sample packs)\nCompo Cleanup"
 END
 
 STRINGTABLE 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.