Browse code

merge in community version

Nat! authored on 08/11/2016 14:14:05
Showing 5 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+MULLE_REPOSITORIES merge=ours
... ...
@@ -1 +1 @@
1
-https://github.com/mulle-objc
1
+https://github.com/mulle-nat
... ...
@@ -1,3 +1,8 @@
1
+1.1.3
2
+===
3
+
4
+* merge community fixes
5
+
1 6
 1.1.2
2 7
 ===
3 8
 
... ...
@@ -1,7 +1,8 @@
1 1
 #! /bin/sh
2 2
 
3
-ORIGIN=origin                                    # git repo to push
4
-REMOTEROOTDIR="mulle-objc"
3
+ORIGIN=public                                    # git repo to push
4
+REMOTEROOTDIR="mulle-nat"
5
+
5 6
 REMOTEHOST="https://github.com"
6 7
 REMOTEURL="${REMOTEHOST}/${REMOTEROOTDIR}"
7 8
 ARCHIVEURL='${REMOTEURL}/${NAME}/archive/${VERSION}.tar.gz'  # ARCHIVEURL will be evaled later! keep it in single quotes
... ...
@@ -37,7 +37,7 @@
37 37
 //
38 38
 // community version is always even
39 39
 //
40
-#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (1 << 8) | 2)
40
+#define MULLE_CONCURRENT_VERSION  ((1 << 20) | (1 << 8) | 3)
41 41
 
42 42
 #include <mulle_thread/mulle_thread.h>
43 43
 #include <mulle_allocator/mulle_allocator.h>