Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/externalpackages

    • Property svn:ignore

      •  

        old new  
         1archive
        12MITgcm
        23OpenAD

  • issm/branches/trunk-jpl-damage/externalpackages/vim/addons/vimrc

    r10985 r13101  
    203203au BufRead,BufNewFile *.c*       iabbr <silent> p1  printf("\n");<Left><Left><Left><Left><Left><C-R>=Eatchar('\s')<CR>
    204204au BufRead,BufNewFile *.c*,*.h   iabbr <silent> ER  _error_("");<Left><Left><Left><C-R>=Eatchar('\s')<CR>
     205au BufRead,BufNewFile *.py       iabbr <silent> ER  raise NameError('')<Left><Left><C-R>=Eatchar('\s')<CR>
     206au BufRead,BufNewFile *.m        iabbr <silent> ER  error('');<Left><Left><Left><C-R>=Eatchar('\s')<CR>
    205207au BufRead,BufNewFile *.c*       ab VV VecView(ug,PETSC_VIEWER_STDOUT_WORLD);
    206208au BufRead,BufNewFile *.c*       ab AS _assert_();
Note: See TracChangeset for help on using the changeset viewer.