summaryrefslogtreecommitdiffstats
path: root/LAST_ENTERPRISE_SYNC
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-03 17:11:27 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-03 17:11:27 +0000
commitd0abc1a165ce7130e802d892e1417617a99a3ba0 (patch)
tree7dc885cf1d4bca7a30bfa8877164008c4966f6b3 /LAST_ENTERPRISE_SYNC
parentc5415f69834f13834179331af41329980fe8a3e8 (diff)
downloadtdelibs-d0abc1a165ce7130e802d892e1417617a99a3ba0.tar.gz
tdelibs-d0abc1a165ce7130e802d892e1417617a99a3ba0.zip
Merge commit 1170303 from the Enterprise branch
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171389 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'LAST_ENTERPRISE_SYNC')
-rw-r--r--LAST_ENTERPRISE_SYNC2
1 files changed, 1 insertions, 1 deletions
diff --git a/LAST_ENTERPRISE_SYNC b/LAST_ENTERPRISE_SYNC
index 2e52917a..75d744c4 100644
--- a/LAST_ENTERPRISE_SYNC
+++ b/LAST_ENTERPRISE_SYNC
@@ -1 +1 @@
-Revision 1170137
+Revision 1170313