upstream/ipython Files · IPython/config/__init__.py

Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend...

Merge branch 'newkernel' of git://github.com/ellisonbg/ipython into qtfrontend Conflicts: IPython/zmq/pykernel.py

Brian E Granger - - Load All Authors

File last commit:

r1234:52b55407


                r2777:9b98ba4e

Download file

             __init__.py
        
                    13 lines
            
             | 580 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / config / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Brian E Granger
    
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...

              r1234
            
      # encoding: utf-8

      __docformat__ = "restructuredtext en"

      #-------------------------------------------------------------------------------

      #  Copyright (C) 2008  The IPython Development Team

      #

      #  Distributed under the terms of the BSD License.  The full license is in

      #  the file COPYING, distributed as part of this software.

      #-------------------------------------------------------------------------------

      #-------------------------------------------------------------------------------

      # Imports

      #-------------------------------------------------------------------------------

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Brian E Granger This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...	r1234	# encoding: utf-8

		__docformat__ = "restructuredtext en"

		#-------------------------------------------------------------------------------
		# Copyright (C) 2008 The IPython Development Team
		#
		# Distributed under the terms of the BSD License. The full license is in
		# the file COPYING, distributed as part of this software.
		#-------------------------------------------------------------------------------

		#-------------------------------------------------------------------------------
		# Imports
		#-------------------------------------------------------------------------------