Home Explore Help
Register Sign In
Canicula
/
glife
forked from Kevin_Smarts/glife
1
0
Fork 0
Files
Browse Source

Merge remote-tracking branch 'Canicula/master'

# Conflicts:
#	locations/office.qsrc
KevinSmarts 5 years ago
parent
10fe3dc21e da2e9d77a9
commit
3f191d2f4b
2 changed files with 223 additions and 206 deletions
Split View Show Diff Stats
  1. 222 205
      locations/office.qsrc
  2. 1 1
      locations/pavSharedApt.qsrc

File diff suppressed because it is too large
+ 222 - 205
locations/office.qsrc


+ 1 - 1
locations/pavSharedApt.qsrc
View File 

@@ -195,11 +195,11 @@ if $ARGS[0] = 'start':
 
 	$menu_loc = 'pavSharedApt'
 
 	$menu_arg = 'start'
 
 	menu_off = 0
 
-	$goBack = $metka
 
 	$locM = 'pavSharedApt'
 
 	$metkaM = 'start'
 
 	$loc = 'pavSharedApt'
 
 	$metka = 'start'
 
+	$goBack = $metka
 
 	$location_type = 'private'
 
 	killvar '$locclass'
 
 	gs 'pavSharedApt', 'update'

Some files were not shown because too many files changed in this diff