Created
October 7, 2009 15:50
-
-
Save lloyd/204153 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| [lth@lappro bp-docdb] $ git diff | |
| diff --cc BuildConfigs.cmake | |
| index 6afd6da,680eec6..0000000 | |
| --- a/BuildConfigs.cmake | |
| +++ b/BuildConfigs.cmake | |
| @@@ -77,7 -77,7 +77,11 @@@ ELSE ( | |
| ADD_DEFINITIONS(-DLINUX -D_LINUX -DXP_LINUX) | |
| ENDIF() | |
| ++<<<<<<< HEAD | |
| + SET(CMAKE_CXX_FLAGS "-Wall ${isysrootFlag} ${minVersionFlag} -arch i386") | |
| ++======= | |
| + SET(CMAKE_CXX_FLAGS "-Wall ${isysrootFlag} ${minVersionFlag}") | |
| ++>>>>>>> f71a285622de6e72b54d9df34dad03b0053c0b92 | |
| SET(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -g") | |
| SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Os") | |
| SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "-Wl,-x") | |
| diff --cc manifest.json | |
| index 718856f,d031eaa..0000000 | |
| --- a/manifest.json | |
| +++ b/manifest.json | |
| @@@ -3,8 -3,8 +3,13 @@@ | |
| "CoreletLibrary": "@ServiceLibrary@", | |
| "strings": { | |
| "en": { | |
| ++<<<<<<< HEAD | |
| + "title": "Local Document Database", | |
| + "summary": "Allows you to store and efficiently search through l | |
| ++======= | |
| + "title": "Lucene Search Engine", | |
| + "summary": "Searches and indexes documents using cLucene" | |
| ++>>>>>>> f71a285622de6e72b54d9df34dad03b0053c0b92 | |
| } | |
| } | |
| } | |
| ...skipping... | |
| diff --cc BuildConfigs.cmake | |
| index 6afd6da,680eec6..0000000 | |
| --- a/BuildConfigs.cmake | |
| +++ b/BuildConfigs.cmake | |
| @@@ -77,7 -77,7 +77,11 @@@ ELSE ( | |
| ADD_DEFINITIONS(-DLINUX -D_LINUX -DXP_LINUX) | |
| ENDIF() | |
| ++<<<<<<< HEAD | |
| + SET(CMAKE_CXX_FLAGS "-Wall ${isysrootFlag} ${minVersionFlag} -arch i386") | |
| ++======= | |
| + SET(CMAKE_CXX_FLAGS "-Wall ${isysrootFlag} ${minVersionFlag}") | |
| ++>>>>>>> f71a285622de6e72b54d9df34dad03b0053c0b92 | |
| SET(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -g") | |
| SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -Os") | |
| SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "-Wl,-x") | |
| diff --cc manifest.json | |
| index 718856f,d031eaa..0000000 | |
| --- a/manifest.json | |
| +++ b/manifest.json | |
| @@@ -3,8 -3,8 +3,13 @@@ | |
| "CoreletLibrary": "@ServiceLibrary@", | |
| "strings": { | |
| "en": { | |
| ++<<<<<<< HEAD | |
| + "title": "Local Document Database", | |
| + "summary": "Allows you to store and efficiently search through l | |
| ++======= | |
| + "title": "Lucene Search Engine", | |
| + "summary": "Searches and indexes documents using cLucene" | |
| ++>>>>>>> f71a285622de6e72b54d9df34dad03b0053c0b92 | |
| } | |
| } | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment