Skip to content

X
xffruit
Commit 0702ff8d authored by 陈俊俊's avatar 陈俊俊
Browse files
Options

Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 

Conflicts:
	XFFruit.xcodeproj/project.pbxproj
parents 5c27c167 2d966eba
master
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ 0702ff8d
...@@ -3042,7 +3042,8 @@ ...@@ -3042,7 +3042,8 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Debug; name = Debug;
...@@ -3063,7 +3064,8 @@ ...@@ -3063,7 +3064,8 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Release; name = Release;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment