| commit | 1a0d7742239a5ab2d54a7cccf17a58d70d0d1ff0 | [log] [tgz] |
|---|---|---|
| author | Zhenkai Zhu <zhenkai@cs.ucla.edu> | Wed Oct 03 23:28:33 2012 -0700 |
| committer | Zhenkai Zhu <zhenkai@cs.ucla.edu> | Wed Oct 03 23:28:33 2012 -0700 |
| tree | e6c09c18cbe380434f53c2de00d29041f8d3d297 | |
| parent | ba3c1d16faec79a84ac615735bae0d1657bbfe18 [diff] | |
| parent | 57f13f49f6d5490b66de008ed72dd8d77acb44a6 [diff] |
Merge branch 'master' of https://github.com/zhenkai/sync
diff --git a/model/sync-state.cc b/model/sync-state.cc index 137e8b0..d9fe538 100644 --- a/model/sync-state.cc +++ b/model/sync-state.cc
@@ -30,8 +30,6 @@ #include <boost/throw_exception.hpp> #include <boost/lexical_cast.hpp> -#include <tinyxml.h> - using namespace std; using namespace boost;