projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Date.js
[gnome.introspection-doc-generator]
/
String.js
diff --git
a/String.js
b/String.js
index
97f065f
..
122a008
100755
(executable)
--- a/
String.js
+++ b/
String.js
@@
-9,10
+9,18
@@
* <script type="text/javascript">
*/
// usage:
* <script type="text/javascript">
*/
// usage:
+<<<<<<< HEAD
//String = imports.String.String;
XObject = imports.XObject.XObject;
String = XObject.extend(String,
//String = imports.String.String;
XObject = imports.XObject.XObject;
String = XObject.extend(String,
+=======
+// Seed.include('String.js');
+XObject = imports.XObject.XObject;
+
+
+XObject.extend(String,
+>>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
{
/** @scope String */
{
/** @scope String */
@@
-125,8
+133,7
@@
String = XObject.extend(String,
* @return {String} The new value
*/
* @return {String} The new value
*/
-XObject.extend(String.prototype,
- {
+XObject.extend(String.prototype, {
toggle : function(value, other){
return this == value ? other : value;
toggle : function(value, other){
return this == value ? other : value;
@@
-154,6
+161,6
@@
XObject.extend(String.prototype,
return this;
}
return this;
}
- };
+
});
\ No newline at end of file
});
\ No newline at end of file