Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.6.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
	doc/ncmpcpp.1
This commit is contained in:
Andrzej Rybczak
2015-03-02 19:24:31 +01:00
parent 4d99dfe940 2ea7db1d20
commit 57788b738b
4 changed files with 192 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/strbuffer.h
View File

@@ -88,7 +88,7 @@ template <typename CharT> class BasicBuffer
public:
typedef std::basic_string<CharT> StringType;
typedef std::set<Property> Properties;
typedef std::multiset<Property> Properties;
const StringType &str() const { return m_string; }
const Properties &properties() const { return m_properties; }