Merge branch 'feature/Sublocations' into develop

ktekinay · Sep 21, 2015 · d32a852 · d32a852
2 parents 8636383 + 56de266
commit d32a852
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Classes/IDEEmulator.xojo_code b/Classes/IDEEmulator.xojo_code
@@ -277,7 +277,7 @@ Protected Class IDEEmulator
 	#tag EndMethod
 
 	#tag Method, Flags = &h1
-		Protected Function SubLocation(baseLocation As String) As String
+		Protected Function SubLocations(baseLocation As String) As String
 		  #pragma unused baseLocation
 
 		  Extras.ShowWarning

diff --git a/README.md b/README.md
@@ -98,3 +98,6 @@ Fork the project to your GitHub account. Use the "develop" branch for general fi
 - Option to save a script with indents.
 - Added keyboard shortcuts to menus for Windows and Linux.
 - CurrentBuildTarget returns an integer instead of a string.
+
+1.2.1 (September 21, 2015)
+- Fixed typo (SubLocations, not SubLocation).
diff --git a/XsEdit.xojo_project b/XsEdit.xojo_project
@@ -1,5 +1,5 @@
 Type=Desktop
-RBProjectVersion=2015.022
+RBProjectVersion=2015.024
 MinIDEVersion=20070100
 Class=App;App.xojo_code;&h21983FFF;&h0;false
 Folder=Menu Stuff;Menu Stuff;&h5C6C67FF;&h0;false