2 csets were pushed to core/stable: Merge...

jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] (Jonn Beames)
Newsgroups gmane.comp.cms.xaraya.bk-notices
Organization Xaraya
Message-ID <[email protected]>
Changes were applied by jsb to core/stable level 10.
    The following csets were applied:
    
    ChangeSet
      1.2069 05/03/12 17:23:51 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +3 -0
      Merge
    
      html/includes/xarCore.php
        1.170 05/03/12 17:22:53 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +1 -17
        manual merge: went with remote (stable) version.
        my changes were only trailing space removal.
    
      html/includes/xarMLS.php
        1.116 05/03/12 17:16:38 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +0 -0
        Auto merged
    
      html/includes/xarCache.php
        1.85 05/03/12 17:16:38 jsb-111RdWWlOxkOkXtL6OYfHgC/[email protected] +0 -0
        Auto merged
    
    ChangeSet
      1.2016.2.134 05/02/06 23:21:08 [email protected] +6 -0
      making the var directory movable outside of the 
      web root.
    
      html/var/example.key.php
        1.1 05/02/06 23:21:05 [email protected] +13 -0
    
      html/includes/xarPreCore.php
        1.1 05/02/06 23:21:05 [email protected] +58 -0
    
      html/var/example.key.php
        1.0 05/02/06 23:21:05 [email protected] +0 -0
        BitKeeper file /home/jonn/projects/jsb/core/movablevar/html/var/example.key.php
    
      html/index.php
        1.148 05/02/06 23:21:05 [email protected] +7 -3
        load preCore
        remove hardcoded var path
    
      html/includes/xarPreCore.php
        1.0 05/02/06 23:21:05 [email protected] +0 -0
        BitKeeper file /home/jonn/projects/jsb/core/movablevar/html/includes/xarPreCore.php
    
      html/includes/xarMLS.php
        1.115 05/02/06 23:21:05 [email protected] +1 -1
        Hey, I thought I'd fixed this in stable already?!
        
        replacing hardcoded var path
    
      html/includes/xarCore.php
        1.162.1.1 05/02/06 23:21:05 [email protected] +19 -27
        alias the xarCoreGetVarDirPath to xarPreCoreGetVarDirPath
        
        the other diffs aren't changes... my editor is removing 
        trailing spaces.
    
      html/includes/xarCache.php
        1.84 05/02/06 23:21:04 [email protected] +7 -28
        we won't need our copied GetVarDirPath function if 
        there is a pre-core way to get it.
    
Links for the differences:
http://xaraya.com:15000/core/stable/[email protected]
http://xaraya.com:15000/core/stable/[email protected]
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.