Commits

Ronald Oussoren committed a78d4a9 Merge

merge 2.5.x branch

Comments (0)

Files changed (43)

 409a8611db37b84407e4e822abd25dc9ef2a3b03 pyobc-1.1
 409a8611db37b84407e4e822abd25dc9ef2a3b03 pyobjc
 0000000000000000000000000000000000000000 pyobjc
+49296f32d5ec848fe19092498eeb0d6812d6b9b5 pyobjc-2.5.1

development-support/upload-release

     for nm in names:
         status = subprocess.call([
             'python', 'setup.py', 'sdist'],
-            cwd=os.path.join(TOPDIR), nm)
+            cwd=os.path.join(TOPDIR, nm))
 
         if status != 0:
             print("WARNING: Building sdist for {} failed".format(nm))
     for nm in names:
         status = subprocess.call([
             'python', 'setup.py', 'sdist', 'register', 'upload'],
-            cwd=os.path.join(TOPDIR), nm)
+            cwd=os.path.join(TOPDIR, nm))
 
         if status != 0:
             print("WARNING: Uploading {} failed".format(nm))
Add a comment to this file

pyobjc-core/Modules/objc/pyobjc.h

File contents unchanged.

pyobjc-core/NEWS.txt

 -----------
 
 .. note:: 
-
    This is version currently in development and has not been released yet
 
+
+Version 2.5.2
+-------------
+
+-
+
+
 Version 2.5.1
 -------------
 
Add a comment to this file

pyobjc-framework-Accounts/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-AddressBook/setup.py

File contents unchanged.

pyobjc-framework-AppleScriptKit/setup.py

 
 setup(
     name='pyobjc-framework-AppleScriptKit',
+<<<<<<< local
     version="2.6b1",
     description = "Wrappers for the framework AppleScriptKit on Mac OS X",
     packages = [ "AppleScriptKit" ],
Add a comment to this file

pyobjc-framework-AppleScriptObjC/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-Automator/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-CFNetwork/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-CalendarStore/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-Cocoa/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-Collaboration/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-CoreData/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-CoreLocation/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-CoreText/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-DictionaryServices/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-EventKit/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-ExceptionHandling/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-FSEvents/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-InputMethodKit/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-InstallerPlugins/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-InstantMessage/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-InterfaceBuilderKit/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-LatentSemanticMapping/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-LaunchServices/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-Message/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-OpenDirectory/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-PreferencePanes/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-PubSub/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-QTKit/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-Quartz/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-ScreenSaver/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-ScriptingBridge/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-SearchKit/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-ServerNotification/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-ServiceManagement/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-Social/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-SyncServices/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-SystemConfiguration/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-WebKit/setup.py

File contents unchanged.

Add a comment to this file

pyobjc-framework-XgridFoundation/setup.py

File contents unchanged.

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.