diff options
author | Yury Melnichek <melnichek@gmail.com> | 2011-03-06 14:08:58 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:12:57 +0300 |
commit | 2cbf9325c48e87d4c277feb9e4926a12698c1236 (patch) | |
tree | 433474cba4980c8a55a161f64f3ad2002c6562c6 /sloynik_common.pri | |
parent | 5d9239a1edede8693c69119e282017d965d2c326 (diff) |
Merge 3party and 3party_sloynik. Remove sloynik_common.pri.
Diffstat (limited to 'sloynik_common.pri')
-rw-r--r-- | sloynik_common.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sloynik_common.pri b/sloynik_common.pri index cbbc6b32e8..73477f155f 100644 --- a/sloynik_common.pri +++ b/sloynik_common.pri @@ -1,3 +1,3 @@ ROOT_DIR = $$SLOYNIK_DIR -include(../maps/common.pri) -INCLUDEPATH += $$SLOYNIK_DIR/3party_sloynik/protobuf/src/ +include(common.pri) + |