labofsahil/github-event-dataset-2012 huggingface dataset:
fixing c++11 build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
fixing c++11 build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Include <wx/textctrl.h> from <wx/combobox.h> for compatibility.

The wxComboBox header itself doesn't need <wx/textctrl.h> but there exists
code using wxComboBox with wxTextCtrl styles and events that doesn't include
<wx/textctrl.h> explicitly because it wasn't necessary in 2.8. So include it
from wx/combobox.h to avoid breaking this code after an upgrade to 2.9.

Closes #14132.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Export wxGTK private widget creation functions from core library.

This is necessary to allow using them from other libraries, e.g. wxAUI that
will do it in the upcoming commits.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Add a private GetNotebookWidget() accessor to wxGTK.

This is similar to the other existing functions and allows to access
GtkNotebook-specific style.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Explicitly include wx/aui/dockart.h from the file needing it.

src/aui/tabmdi.cpp needs wxAuiDockArt declaration as it uses it, don't rely on
wx/aui/dockart.h being included from other wxAUI headers and include it from
here explicitly.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Refactor wxAUI: extract wxAuiTabArt in a separate file.

No real changes, just extract wxAuiTabArt into its own file. Also rename
wxAuiDefaultTabArt to wxAuiSimpleTabArt in preparation for having other tab
art classes as the default one.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Implement native tab art for wxAUI in wxGTK.

Use native wxAuiTabArt implementation in wxGTK, it better conforms to the
system style.

Closes #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
Début prise en compte du joueur pour la connexion client
minor fixes to README
minor fixes to README
updating readmes
Bump version to 1.0.7
Merge branch 'hotfix/1.0.7'
Added HTML5 slider and other improvements
ActiveRecordのmodelのspecを作成
upload_token.php => uptoken.php
Add details
commit for README
XCOMMONS-188: Upgrade to Maven Compiler plugin 2.5.1
完成找工作模块除搜索、申请和收藏外的页面展示功能
Elm JS example added

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>
Added data to python callback

 Now: to add callback to python object, callback object needed to be
 created, which is tuple (func, data)
   cb_obj = (func, data)

 Now callback can be added to object or deleted:
   button.event_callback_priority_add(CLICKED, 0, cb_obj)
   button.event_callback_del(CLICKED, cb_obj)

   Case like this:
     button.event_callback_priority_add(CLICKED, 0, (func, data))
   will also work out, because reference to object is incremented.
   But there will be imposiible to delete such callback.

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>
C++ object must be casted to base class, before casting to void*

Added: JS example with changed names

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>
Developer's README added

Signed-off-by: Yakov Goldberg <yakov.g@samsung.com>
bug fix wrong filename
2012.05.02
add shutdownhook
Merge branch 'master' of github.com:yaochen1025/MiniRSA
Ruby のシンボルの説明を書き直し。
Fix build on mac
hlint
add ftp-server executable
Move utils module
Move filepath encode/decode utils.
fixed type and pretty print option
added twitter bootstrap
Show tableview
collaborates with w3m for msdn
add douban and flickr from master
Add initial changes
Merge github.com:yzhivkov/mazesolver
Fixed compatibility with asterisk 11
Get Title aligned with page
Test
Test
added a comment that says comment
deleted comment
added pinterest
changed count layout to vertical
added google+
added different google+
added different google+
deleted comment
adding mobile page
mobile
Merge branch 'master' of github.com:faaez/BeneTag
Some error checking
fixed the producer name logic. it was initially being set to email which is wrong. allowed multiple producers to be associated with email for now. could change this later on
mobile view done
mobile desin update
lots of changes to logic
add util
merge changes
change layout to resolve ad problem
* OverlayWidget uses PlaylistView as an event-filter for Drag-n-Drop events.
* Support loading and cache artists' biographies in Artist object directly.
* Got rid of all direct InfoSystem calls from ArtistInfoWidget.
* Set default vertical alignment for QueryLabels to be centered.
* Make artist & album names clickable on track page.
* Make FuzzyIndex robuster.
* Moved reindexing to FuzzyIndex.
* Prevent race condition when cloning DatabaseImpls.
* Make sure Phonon errors show up on console, and not just the log file.
* Send version string along when requesting providers.xml from server.
* Keep retrying on commit transaction locks.
Automatic merge of Transifex translations
Don't use auto-release pool and manually release created NSString*
TWK-922: Text fix for Account delegate
Only wait for shutdown of script resolver if it's running
Fix stupid regression in sizegrip hiding when fullscreening
Move spotify account to libtomahawk
Remove assert as it might happen in valid conditions sometimes
Better reasoning in comments
Move Last.fm account to libtomahawk
Board prints properly, segfault in makeBoard around fscanf
playing around with texture maps and lighting.
Implement SQLiteDatabase#inTransaction
Removing abstract from Draw class
adding MNMMonoPolySketch to DevelopmentFirmwares
Changed the text displayed when loading a new MNM kit
Modified SketchSwitchPage - press button1 and button4 (top two buttons) to jump out of a sketch back up to the sketch switch page
as suggested by Wesen, to try to resolve errors when trying to build DMG file locally
Stupid git, last commit was broken
mobile - added android support
[Microsoft] Exclude bing.com/fd/fb/mulmfg

Breaks login menu.

https://trac.torproject.org/projects/tor/ticket/7092
[Myspace] Cosmetics
[Myspace] Add coverage & comments, secure cookies

Also remove unneeded exclusion.
[Arch Linux] Cosmetics
[Arch Linux] Secure cookies
[Unhosted] Change default_off reason

Moved and broke.
[Google Services] Add coverage
cchtml.com
DNSSEC-Tools
[Blogger] Add coverage
[Ziff Davis] Add comment
GumGum
Met Office
Merge the contentfilters plugin into the main project
Matched function to file name.
Revert "Migrated to Dev11 project files.  They should all open in Dev10 still (except the new .sqlproj)."

This reverts commit dc59bdbc51fce4ad19cb41e5ca610915c2e99789, reversing
changes made to e5b8e2e4bd925ef6967c264644e4d67749b5b3de.
Update notes for submitted changes

* framework: correct size of some toggle icons
fix IME down arrow for custom navbar

Change-Id: Iff98d27c109d0e954819dd64842c2a151b71794b
Signed-off-by: Zaphod <mwilson@acesappraisal.com>
Merge "fix IME down arrow for custom navbar" into jb
Bugfix

Fixed a couple of typos in NetworkPlayer and Computer
remodularizing the ai
Getting JP working again
Add mingw-w64 tools for build
event new db
upload to picasa
Merge branch 'master' of github.com:AlloVince/eva-engine
Patient ID added
Added directory listing , and a small script based  pentesting netcat suite
Firefoxでテキストエリアをgvimで編集できるアドオン
Meet the Dafizilla ViewSourceWith Developer
用にfiletype pluginをつくった．
firefoxeditという名前のファイルタイプ
エンコードをutf-8,unixにした
added task1.js
Update INSTALL/permission.sh
rm of ~
deleted graphpost from models
changed background color back, changed border to white
starting to reorganize
ready to merge into master??
merging
Recibo a clientes por triplicado simple
removed unnecessary import
changed docstring of zero one loss
fix subdomain protection by using a before_filter on the application controller
Added FAT FS, RamFS, File, etc.
correct faq Q3
lots of little tweaks. turned square into rectangle with a square convenience method. applied new create code style to more objects. fixed a typo where bullets could miss from below.
Merge branch 'master' into gh-pages
moved var timeline from .ready out to global scope
fixed where deleting a section wouldn't close the toolbar; fixed by making selectables fire a deselect event when closed
Version 2.3.1 - Bugfix: #14, #15
added exception

L'utente ha autorizzato l'applicazione ma l'ha rimossa prima che
scadesse
Polished up Scons build system.
Created  a first python test
Replaced tabs with spaces and corrected a few long lines
proper table on organization index
proper table on user index
Core/Misc: Add a validity check for coordinates, prevents crashes
Core/Movement: Fix random position finding near edges, avoid big z-coordinate differences
Arenas/Ring of Valor: fire lines should only be lit when the arena battle begins.
Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <2359980687@qq.com>
Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <2359980687@qq.com>
Core/Player: Initialize m_WeeklyQuestChanged

Fixes:

==8111== Conditional jump or move depends on uninitialised value(s)
==8111==    at 0xFB7AD2: Player::_SaveWeeklyQuestStatus(Trinity::AutoPtr<Transaction, ACE_Thread_Mutex>&) (Player.cpp:19352)
Core/Player: Similarly initialize m_SeasonalQuestChanged

Fixes:

==8111== Conditional jump or move depends on uninitialised value(s)
==8111==    at 0xFB7C42: Player::_SaveSeasonalQuestStatus(Trinity::AutoPtr<Transaction, ACE_Thread_Mutex>&) (Player.cpp:19375)
==8111==    by 0xFB56BA: Player::SaveToDB(bool) (Player.cpp:18898)
Core/Battleground/SOTA: Initialize uninitialized variables.

Fixes:

==8111== Conditional jump or move depends on uninitialised value(s)
==8111==    at 0x12B542C: BattlegroundSA::FillInitialWorldStates(WorldPacket&) (BattlegroundSA.cpp:421)
==8111==    by 0xF93CD9: Player::SendInitWorldStates(unsigned int, unsigned int) (Player.cpp:9664)'

And similar.
Core/Misc: Prevent calling ACE_Task_Base::wait() on an invalid handle. WorldSocketMgr::Wait is already called in WorldRunnable post-service hook
Core/Game: Code style.

Signed-off-by: Gyx <2359980687@qq.com>
Core/Game: Code style again.

Signed-off-by: Gyx <2359980687@qq.com>
Core/Spells: attempt to fix penance doing nothing on "friendly" non faction targets. should return invalid targets
SQL: Auth db data type cleanup `account` / Storage engine switched to InnoDB
SQL: Auth db data type cleanup `account_access`, `account_banned`, `ip_banned`  / Storage engine switched to InnoDB
Core/GameEventMgr: Fix a compile warning
Partially revert a36a0a77ef75e66933ac5b8802a9ec7906acfd0b.

Cleaning databases for old/deprecated and expired quests should never be a
developers choice specifically. This should be done by admins, not developers,
through the use of the already existing paramters found in the worldserver config :
CleanCharacterDB / PersistentCharacterCleanFlags

An adjustment to the respective questloader prepared statement has been done to
accomodate for the earlier change (by not loading such quests into memory at all).

Documentation for how this cleanup-procedures work already exists in the core :
doc/CharacterDBCleanup.txt.
SQL: Auth db data type cleanup `logs`, `realmcharacters`, `realmlist`, `uptime`  / Storage engine switched to InnoDB Note:

As for the redundant `uptime`.`startstring` being removed, this page might be of interest how to generate time strings from unix timestamps
http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html#function_from-unixtime
SQL: Proper prefixing
Core/DBLayer: Fix value list from recent changes
Core/Scripts: Fix invincibility hp level for smart scripts.
Messy merge (or not)
test repo
test new old repo
Fixed pub/sub
removed heroku (naughty heroku) settings from bashrc and placed them into the localrc
#234 copy through leading whitespace on new line, also refactor previewkeydown
#264 cursor left/right with selection
#269 ctrl-right behaviour
#269 fine tune ctrl-right behaviour
#268 hard line breaks
#276 overtype mode
Merge
Merge pull request #279 from JakeGinnivan/issue234_newline_in_indented_text

Issue234 newline in indented text
superenv: Add brewed-python bin to PATH

A required special case since formula that use python can optionally use system python or Homebrew python. We'll probably need more of this sort of thing.
jenkins 1.484
python: Fix site-packages installs via pip (& co.)

- Removed accidently added -py-debug
- Ensure HOMEBREW_PREFIX/share/python exists as a dir
- Don't change the sys.prefix (broke virtualenv)
  and instead add install-lib dir to distutils.cfg.

superenv respects brewed python

Closes #15220.

Signed-off-by: Max Howell <mxcl@me.com>
py2cairo no longer requires superenv

In fact, it doesn't even compile on NCLT with stdenv.
gpsbabel 1.4.4

Closes #15216.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
pgdbf 0.6.2

Closes #15211.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
the_silver_searcher: fix compilation on 10.6.8

Fixes #15214.
Clisp doesn't like -Os; Fixes #14698

superenv isn't flexible here yet, and I'd rather wait and see what else is needed before making it flexible in this way.
ElasticSearch 0.19.10

Closes #15227.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libdiscid 0.2.2

Closes #15169.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
gmp: remove option to skip tests

Refs #15114.
bochs 2.6

Closes #15188.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
pngcrush: add DPNGCRUSH_COUNT_COLORS flag

Fixes #8670.
Closes #14908.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
New formula: rabbitmq-c

RabbitMQ C library formula and dependencies, including the
rabbitmq-codegen library required to build.

Closes #13437.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
eot-utils 1.1

Closes #14187.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
log4cxx always depends on automake/libtool

Closes #15234.
ChkTeX requires userpaths

Fixes #15218.
dpkg still fails with clang and prolly always will

It's the kind of syntax error that GCC shouldn't allow so I don't see clang allowing it. This formula needs to be patched.
weechat 0.3.9

Closes #15237.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
groonga: silent version update

Closes #15236.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Trying to get some basic authentication. Almost done.
Figured out pagination route. Need pagination links.
Fixing up source / repos
added .gitignore for future use
Additional work on admin interface
Merge branch 'master' of github.com:Daladevelop/ddEventz
More ignore fixes
Fixed conflicts
Added spin.js recipe
Added OnFileAlreadyIncluded and OnAlreadyIncluded
first word loading
Remove MM registration link from home page

MechMania registration has closed. Removing the link.
minor fix in calling info_msg
*MODIFY More rebarized now
Active Record documentation cleanup
Merge pull request #1180 from timw4mail/develop

Active Record documentation cleanup
DB/Conditions: Implicit Targeting for HOTR in Eadric the Pure Encounter
added more api docs to quiz api and assignments, added failing tests for quiz versioning
d2vzw: Update fingerprint to VRALHD

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
d2usc: update fingerprint to LI4

Signed-off-by: BMc08GT <bmc08gt.teamb00sted@gmail.com>
Merge "d2usc: update fingerprint to LI4" into jb
Merge branch 'jb' of https://github.com/AOKP/vendor_aokp into jb
WIP: Label smoothing
Adding some Listener and Events.
esup-blank maven archetype
Copy files from svn project.
Oops. Forgot web (stylesheets, css, etc...) files.
Renommage des jsp en xhtml
Nettoyage

Nettoyage dans les pages xhtml
icescrum#14

mvn -Dmaven.test.skip=true clean install
Merge branch 'develop' into traduction-pages-jsf2
Merge avec la branche mavenization
Put wsdl files in src/main/resources
Configuration Spring

Configuration Spring pour faire démarrer l'application
Merge branch 'demarrage-application' into develop
Traduction pages gestionnaires

traduction des pages xhtml à la racine de l'arborescence gestionnaire
travail sur le déplacement des menus gestionnaires dans la barre de navigation
Traduction des pages candidats en jsf2
Traduction pages gestionnaires pilotage

Traduction des pages xhtml liées au pilotage
Traduction des pages candidats.
Traduction des pages candidats : account et formation.
Merge branch 'traduction_pages_candidats' into develop

Conflicts:
	esup-opi-dao/src/main/resources/META-INF/esup-opi-dao-dao.xml
	esup-opi-domain-services/src/main/resources/META-INF/i18n/bundles/Messages_en.properties
	esup-opi-web-jsf-servlet/pom.xml
	esup-opi-web-jsf-servlet/src/main/java/org/esupportail/opi/web/beans/ManagedAccess.java
	pom.xml
Merge branch 'develop' of git@github.com:EsupPortail/esup-opi.git into develop

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:EsupPortail/esup-opi into develop
sum calculated
add default editor for git
check if series alrady there before downloading
if series already there, do not do anything
hello, gedcomx, nice to meet you. again
modify from friend
triangles now quads, not centric to the middle anymore
renamed inc.php to autolaod.php
Licence to all files added
I have created annotation @Mock
modification du htaccess qui faisait planter l'iut
[install-deps] improved filter
Merge pull request #119 from Fugiman/master

Fix #118
Make README show up on site
New branch?
Test image for the readme
Added image to readme file
Fixed URL to the readme image
Moved testcanvas to js/views folder and changed path
Merge branch 'Developer' of https://github.com/Fuhr/DMEHealthCollab into Developer
Merge branch 'Developer' of https://github.com/Fuhr/DMEHealthCollab into Developer
Fixed URL to the readme image
Fixed URL
Fixed URL
Test layout of canvas page (issues with portrait mode and responsive design)
Fixed portrait mode responsive error (bootstrap-responsive is now customized!)
Readjusted CSS after testing on hardware (values were off on iPad)
Added meta configuration for apple devices
Organized Canvas code. Made New controller and util scripts
renamed testCanvas to canvas
Added functionality for setting draggable param on shapes
Added "toggle draggable" functionality to canvas (only affects local client)
Server now transmits client ID to client upon connection
Object can now be moved on one client and move is seen on all clients
ADDED Aufgabe2

commit der Dateien fuer Aufgabe2 mit Stand Ende Uebung c++
add pony-mode
side column background eliminated
修改了.gitignore和.gitattributes
format von gefundenem text bestimmt
frame zurueck geschoben
Fixed a recursion crash in organs taking damage.
Merge pull request #831 from Miniature/master

Fixed a recursion crash in organs taking damage.
Adds slashing to Soghuns and nerfs human punching. Slighty buffs disarm pushing.
Fixes toxin crate charges.
Fix for jetpack traitor objective.
Soghun and Tajaran now have differing male and female versions. Fixed some sprite errors with Tajaran dismemberment and mouths.
Get the hell out of my snacks, appendix!
Merge pull request #836 from Miniature/master

no more edible appendix
Merge pull request #834 from Erthilo/master

Nerfs punching, buffs disarm pushing slightly, fixes toxins crate charges and jetpack objective, adds sprites for different Soghun and Tajaran genders
disabled books ever using sql
made passive gate prettier and use input as target pressure for output so it has a unique use as pure one-way valve
Merge pull request #838 from Tastyfish/master

books, passive gate
Fixes bone surgery.
Fixes cyborgs putting items on Operating Tables and Janitor Borgs trashbags.
Adds stuttering when cold.
Merge pull request #839 from Erthilo/master

Fixes bone surgery, cyborgs putting things on operating tables, janitor borg trashbags, adds stuttering when cold. It is all Sky's fault
Added some different suicide messages
Fixed a runtime error with jumptomob()
Made chemmasters a lot more responsive.
Merge pull request #841 from Miniature/master

Made chemmasters a lot more responsive.
Update templates/main.html
fixed ssl cert problem.
Fixes for bookmarklet, following Mick Deal/lts-tech-test report..

* CSS 'cursor:move' seems to have made the bookmarklet draggable in IE?
* Plus, re-worked the help text "Drag the bookmarklet..." using site Javascript
* ..so that Bookmarklet link-text and title attributes match
Mod to the Twitter block view Javascript - stop looping
Mods to .gitignore - /.html pages
JSLint fixes for jquery.clipboard2 Javascript/JS..

* Still a problem with duplicate var declations, for 's', 'r'..
* http://jslint.com/
Remove unsed files.
Document updating.
Add some transactional-ish sensei writing features.
Get rid of hash operator overloading.  Should no longer be necessary.
Fiddle with transaction implementation some more.
style($compile): clarify argument name
test(sortedHtml): fix comment support in sortedHtml helper
test(sortedHtml): ignore bogus rowspan=1 and colspan=1 in IE
feat(ngRepeat): comment-based repeater

repeaters can now be invoked via comments:

```
<table>
  <!-- directive: ng-repeat item in items -->
    <tr><td>{{item.text}}</td></tr>
    <tr><td>something else</td></tr>
  <!-- /ng-repeat -->
</table>
#29605693: fixed the city wise ride offers creation
adding video.rb corrections
Updates title
Removes unused javascript element
Indents and updates doctype etc.
Added more stability and test for Polar (actually spherical) vector in int coordinates
Still get strange behavior on croos and dot vector product => testing this now
Updating Gemfile.lock before production.
fixed the selection for potions
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
Started creating armor info
fixed story text file
fixed collision with enemy
fixed all collision recs for player
Merge branch 'Aaron_Working'
iterate thru dirs and create the tree
Solved session 1 challenges
Shift annoying reflection stuff into a common utils class.
Make it avoid reflection for a small number of args.
UPdated tmux config
Merge pull request #59 from adigitalnative/master

Moved Ch 14 reference problems from the Ch 15 to Ch 14 folders
Extract code points methods into Utils::CodePoints.
changing page viewing logic
[fix] student address edit modal validation
Merge branch 'master' of https://github.com/kalkov/GAKUEngine
Merge branch 'master' of https://github.com/kalkov/GAKUEngine
[validation erros] handle new student address serverside validation errors
[validation error] edit student address validation error
Merge branch 'master' of https://github.com/kalkov/GAKUEngine

Conflicts:
	app/views/students/addresses/_address_modal.html.slim
	app/views/students/addresses/_new.html.slim
[spec/controllers]fix pending spec for creating an exam
[views] Refactor students/course_enrollments
Merge branch 'master' of https://github.com/Genshin/GAKUEngine

Conflicts:
	app/views/shared/modals/_address_modal.html.slim
	app/views/students/addresses/_form.html.slim
Remove shared/modals and return partials to old places
Merge pull request #88 from tapalilov/master

fixing conflict and matching
[views] Rename _show to for example _address, etc ...
fix students/show
make defualt value from exam portion max score
hide weighting total scoring based on flag in exam model
[fix] add back button to guardian show
[fix] add back button to exam grading
Merge commit 'dc1b1fb6b4043076bc9ce748454369f4801c45ec'
[spec/requests] Add, edit and delete specs for class_groups_spec
[ajax] add new semester to class group
Tentando criar sombras.
Minor stuff AND PLZ NO PORTUGUESE IN CODE.
Isso tá muito engraçado pqp
Added libraries for Apache POI.
Sivir Alpha - 0.5.1

Sivir is still in the developement stage, however if you wish to see how
Sivir will work you can download the source code.
Update submodule: myoctheme
Install submodule: myoctheme & update related files
Reset version
Updated encoding infos
Updated installation instructions and removed the redundant ini configuration option used to specify the EventClassAttributeID (which was already specified)
Attributable data types and one_way fix
Stable version 1.0.1

+<ADDED>non OP's have the ability to change the owner of a pet only it
it belongs to them, OP's can change the owner of ANY tamed animal
ADD

-ajout diagramme de séquence système général
-ajout diagramme séquence système Paramétrage
Removed links to deadlines/EasyChair/submissions.
Fixed Documentation Link
Project Backup
Merge branch 'master' of github.com:LauraGonzalez/Armida
修改前台
修改前台
修改前台
修改前台
修改AppLookAndFeel类的注释
Display shared folder relative path
Various fixes
Update locales.
changed node.set_unless to conditional #bugfix
Switched Gallery2 to stock 4.2.1 AOSP

To accompany the camera...no need to track CM's camera/gallery upstream at this particular point in time, we can just take the good features right now the way they leave stuff staged it makes for painful compiling on our end. This should be more reliable..ill add collaborators for G2 aswell
Scope and JSHint cleanups.
reverted .sln after corozyf fucked up
Whitespace fixes.
Cast error on connect.
stdint.h fixes.
Small fix.
Fix NullPointerException inside the Parser class
B and N to change ambient Light
Use self
Rename variables to ease readability
Create method to handle updating stat key values
Fix up invalid attributes and remove debugging
fix #25 #29 #31
Update readme.txt

Rule was fixed.
Some fixes for city's capture.
le 18 juin
Revert "Lancement du projet youppiiiiiii"

This reverts commit 6e87f2e7d52dd6859e087f96576fd54cfcd869a3.

Conflicts:
	exam/FicheCommande.java
fixup! Ticket #55: tab completion vs. spaces and escaping
fixup! Ticket #55: tab completion vs. spaces and escaping
fixup! Ticket #55: tab completion vs. spaces and escaping
Ticket #2747: fixups of hotlist loading.

Path transformation while loading hotlist breaks shell variable
substitution.
Load paths from hotlist as is withowt any transformation.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Support of use ~ as home directory in hotlist.

Expand tilde while vfs path canonicalize.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Merge branch '2747_hotlist_load_fixups'

* 2747_hotlist_load_fixups:
  Support of use ~ as home directory in hotlist.
  Ticket #2747: fixups of hotlist loading.
Facebook data retrieval
Mock interface with initial table
Working RC: loads first 200 timeline posts and displays them in a list,
ordered by creation_time DESC
bcm2835-bootloader: update to bcm2835-bootloader-b616053

Signed-off-by: Stephan Raue <stephan@openelec.tv>
bcm2835-driver: update to bcm2835-driver-b616053

Signed-off-by: Stephan Raue <stephan@openelec.tv>
linux: update RPi patches

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-frodo: better temperature handling on RPi

Signed-off-by: Stephan Raue <stephan@openelec.tv>
xbmc-pvr-addons: update to xbmc-pvr-addons-fcdf846

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Merge remote-tracking branch 'upstream/master'
Added github info to index.html.
Dodanie przycisku "Usuń" (jeszcze nie działa)
Fixed type of ruby-dev-default-port
Improved ?do/+loop, added DUMP and some other words.
Started work on 'see'. Not finished.
Added missing file.
Expose bitmask for name length as Forth constant.
Finished simple decompiler: SEE. Disassembler next...
Changed repositories to com_allicons

fix for delete icon bug
Changed MultiQPoll SQL Script
[TASK] Added base line-height style for Post content
- bugfix in FinishSimulationAction
- bugfix in GameEndAction
Bug 749727 - Ensure that each Fennec channel runs its password content provider in a different process. r=blassey, a=blocking-fennec
Bug 747445 - block on onLowMemory() event - r=blassey, a=mfinkle
Bug 744727 - Fix methodjit register alloc bug (r=bhackett,a=akeybl)
Bug 749727 - Fix process name to avoid Bug 750548. r=blassey, a=bustage
Bug 749727 - Try to outwit talos again. a=bustage
Bug 753534 - Desktop Bookmarks folder is created after migration from XUL to Native. r=lucasr
Bug 753534 - (Part 2) Replace getMobileBookmarksFolder with calls to getFolderIdFromGuid. r=lucasr
Bug 752759 - Get rid of excessive mFormAssistPopup.hide() calls in PanZoomController. r=kats
replace Makefile with sbt 0.12 build
If the user disconnected before the server processed the Join message, they would be added to the members map even though the websocket would be closed. This would cause the username to be stuck in the room. Now, if the WebInstance fails to send a message to a user, it kicks them out.
Moved all interaction with the NetLogo instance to another actor so that commands run in the background.
Ground items
* Created List Objects
Only use close method to close connection in linux

In winpexpect, the close() method is a blocking call and
has a different implementation as in pexpect for linux.

Also try best to close a VistA connection gracefully.

Change-Id: I34f995acb4a4b7c91024b1a2e7b869a0ed119496
Merge "Only use close method to close connection in linux"
add save! and save methods in base module
script.xbmc.lcd: rename to 'xbmc-addon-lcd', add script to get and package, update to xbmc-addon-lcd-6b08848

Signed-off-by: Stephan Raue <stephan@openelec.tv>
projects/*/linux: disable Generic HID driver for now

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Fixes Issue #655

Also sets the default value for the SABnzbd-Suite auto wake
option to false.
Merge pull request #656 from sirenum/fix-655

Fixes Issue #655
bcm2835-driver: update to bcm2835-driver-c8359c0

Signed-off-by: Stephan Raue <stephan@openelec.tv>
Revert "busybox: fix last commit, thanks to vpeter"

This reverts commit 40824b50e03ed431bcb8c27dda74a6c41bcf52b2.
empresa modelo y material listos
adding exception and helper module
Added LinkedList to NXTRandomSim.java
Psql escape bytea
Correccion CSS perdido
Switch to AOKP phone.
Zmiana sposobu radzenia sobie z wygasłą sesją.
Logowanie do pliku
Implement #368 (too many parentheses)
Merge pull request #385 from RGustBardon/implement-368

Implement #368 (too many parentheses)
Fix for issue #386
Merge pull request #387 from rvanvelzen/master

Fix issue #386
Fix Java 6 building.
fixed some bugs
Merge branch 'master' of https://Renasu@github.com/Raane/fellesprosjekt.git
Bug branch
c
Implemented X11 Windowing for GL Renderer
Fixed bug with RendererManager destruction
+ New Feature: Approve Faas Listing
Merge branch 'master' of github.com:RamesesDev/etracs2.1
Update shell/admin/Vault/iSCSI Cheat Sheet.txt

A few commands to update.
Aplicado evento onChange al checkbox de daltonismo
Updated PMIC driver Galaxy series.
все вкладки функционируют
style
refs #14
include test to be done
check this thread: https://groups.google.com/d/topic/specs2-users/R86Zahr_3ro/discussion
add sign up token
Merge branch 'sign-up-token'
120-appendix-a done
Rename and repropose repository
SCEDC catalogs SCSN and SCEC formats, update 08.21.12
load train update
homework3

fine-tuning of year loading
Refonte des images attachées - Dimensions des images à la Une personnalisables
Typecasting an eventual string value to an array.

Changing the handling of the value from checking for
an array and building the result array accordingly
to simply typecasing the value to an array.
post の部分、無理くりやってたのを直した
Update to Rails 2.3.11 and adjust development dependencies
Add support for discounts:

* discounts array (discount.amount, discount.savings, discount.code)
* discounts_amount
* discounts_savings
organizing adaptive sampling
Did difficult challenge 1.
Added an Update Statement that Deleted Records.
Basic test case.

Test.java runs COMTOR.g over a file and obtains the resulting tree.
That's it right now.
Fixed bug in Battle Buddy rejection

ticket #27395907
add C-Main base structure
change return value of C-Main
Changed the clock_array iterator block style

From do..end to {..}
added slash for correct symbolic link paths as $STACKATO_FILESYSTEM does not have trailing slash
first commit
added cross browser compatibility
test
Merge pull request #32 from dasasha/master

added cross browser compatibility
edited index
imgs
Merge branch 'master' of https://github.com/dasasha/punk-shop-yii
pull and change main.php
added timezon function to index.php
added timezon function to index.php
repair captcha + add new sql databases +schema
test
Test Netbeasn commit!
Test Netbeasn commit!
some deletions
global delete
Merge B project as our subdirectory
some fixes
goods model and view fixes
fixes
Added a rails-prepped .gitignore
Updated the protocol outline after some 2 minute feedback
Commented out the things that are not working at the moment. Also cleaned up the code a bit
bugfix: remove initial getLastKnownLocation. If lastKnownLocation is null, it will crash the app.
Changement de GameScreen en GameVersusScreen + warnings
Changed all http packets to RESTFull

Note: this breaks a lot of the NexusClient stuff
Remise en forme des modification de compte + securisation + ajout depot/Retrait
Merge branch 'master' of https://github.com/Tennessy/bankProject

Conflicts:
	admin/navPane.php
(PS3) Abstracted rotation code to allow for different implementations
Add gfx/fonts/fonts.c.
adding plupload and filefield_sources for file management
Merge branch '7.x-1.x' of github.com:ThemeGeeks/nodemaker into 7.x-1.x
Modified Model classes
Merge github.com:ThomasSievert/Pacman

Conflicts:
	Code/Model/Fruit.hpp
removed target folder
generate proper hashcode implementation
upped to version 0.4.FLY
Store file approvals in local storage
update version to elliptics-2.10_2.13.0.1
Add led RX/TX blinking for extension LEDs
Change the way votes are added to make way for a change vote command.
It is now possible to change your vote.
Fixed bugs

Finish Visteon
Revert "addon.gypi: disable MSVC C4251 warnings"

This reverts commit 8d224605a202f75dd625bae7d33d5a03f0596c02.

No longer necessary since joyent/node@e8fd808dfb0065466712e5115b25f2c6ce984c14
landed.
Fix: Action Logs

Minor Formating Error
Updated the background images for blog
Full picture orientation issue
fix whitespace bug

Signed-off-by: Ian Landsman <ian@userscape.com>
trim fix

Signed-off-by: Ian Landsman <ian@userscape.com>
more trimming

Signed-off-by: Ian Landsman <ian@userscape.com>
Fixed fuckup with bikes in herre.html
final selenium, working
Add recaptcha to registration form.
tell eclipse to allow short php tags
add FAQ page for users and devs
Adding CompositeController
..
Better error message.
Move nodes into own package.
Add event handling.
Shorten command class names and remove default arguments.
Implement node un/listen commands.
Fix nl in help message.
Add todo in readme.
Beautify help message.
Fix node un/listen commands.
Implement node disconnect.
Implement node disconnection.
va la cuarta
added chocolatey/nuget repos
Adding a title to the runtests.html
Tryruby link
Moved a lot of thing: using file from Client, as they're up to date.
Update Singleton. Added Database
Changed attribute name
When receiving something while fighting, always set an pointer to the enemy before any action
Added Unit information

(Unit wheights 56 bytes, so filling 500Mo of memory is the equivalent of 9 000 000 Units !)
Added Enum.
Also created a macro to make debug output easier
Added Unit class
Modified filename
Getting army and setting ID working
script improvement

Signed-off-by: Victor Gonzalez <vgonzal@ubuntu.(none)>
#192 okay actually one of those routes WAS used
sorting removed from task and logging added
いったん自動生成したファイルを削除します。
Jetstrap で生成した Bootstrap 使用のテンプレートを追加します。
Wrap up the context pointer
Update bin/redtube.sh
tmp compile fixes

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
Move non acl routines out of _USE_NFS4_ACL

copy_attr_val and verify_attr_len are not specific to _USE_NFS4_ACL
and cause compiler error when the flag is not used in the config line.
These two functions need to move out of the _USE_NFS4_ACL flag

Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com>
function signature fixes
Signed-off-by: root <root@DD5_3.(none)>
Revert "Bump version to 0.6.0 and update NEWS"

This reverts commit 6747a00dfb2c00262d735090acdc79f073ca5d64.

Conflicts:

	NEWS
	SparkleShare/Mac/SparkleShare.csproj
	SparkleShare/Mac/SparkleShare.sln
	configure.ac
forgot an alias
Rewrote the documentation in Markdown
Added a section on catching errors when the promise is rejected.
A little extra clarity.
Merge pull request #53 from wibblymat/promises-docs

Documentation rewrite
Center popup
more scripts for ip assoc/disassoc and ami snapshots
Merge branch 'master' of github.com:adimania/aws-scripts
update gyp file based on jdiehl's xcode 4.4 changes
add xcode project
Remove C++11 warnings.
Add HIDPI and SDKROOT
Merge pull request #49 from adobe/jason-sanjose/gyp

Update GYP file to work with Xcode 4.4
Merge branch 'refs/heads/master' into randy/close-live-browser
Windows cmd script to stage brackets & brackets-shell bits for MSI
installer generation. The MSI generation script itself is not checked in
yet.
Fixes for code review: change name & meaning of env var to match Mac
scripts; add Win staging dir to .gitignore just like Mac
Merge pull request #76 from adobe/pflynn/win-installer-staging

Windows installer staging script
Also copy figures to temporary directory.
BZ 809181

https://bugzilla.redhat.com/show_bug.cgi?id=809181
Re-apply d939a6cddd8b42144cfab30659d57ca8d619e396

  * Correct configserver-setup keep_going prompt
    (reverts 67615208560f4d2515e5326b84b953b28040e502)

  * Small correction for catching the "empty" answer for "keep going"
Version bump for: BZ 809181

https://bugzilla.redhat.com/show_bug.cgi?id=809181

aeolus-configserver-0.4.9-1
add documentation to silence most doxygen warnings
switch to twenty twelve
LOW / Layout with SplitPane / In progress...
LOW / Removed logs
MEDIUM / Support for SplitPane in EditionPatternView FIB
Add workaround for sbp

SBP (1394) does not let a tpg be enabled until there is at least one
LUN defined for it.

Signed-off-by: Andy Grover <agrover@redhat.com>
Hiding black screen :p
最近の評価結果を参照するための history, latest, recent 手続きを追加

(history :optional (len 10))
直近の評価結果を len 件表示する。

(latest)
直近の評価結果を返す。

(recent idx)
history で表示される index の評価結果を返す。
bugfix goshREPLバッファ間で移動したときにオリジナルのlispwordsが上書きされてしまうバグを修正
Merge branch 'master' of git://github.com/cryks/vim_goshrepl
取り込んだコミットを修正

ユーザ空間をできるだけ汚さないようにgauche.sequenceのuseを削除。

多値の戻り値に対応するため、履歴の保存をprinter関数内で行うように修正。
remove libz-dev from Ubuntu install_packages. It is already a listed pre-req in the readme (by another name) and causes rake to need sudo privileges.
merging package versioning into master
removing regex usage
removing regex usage, fixed
cleaning up the tag usages
changes print, and touch up
extra colon
clean old debug, add listing of tempfiles
don't display tags, make sure we don't get a substring match
I believe error code 239 means failed to lock repo for update
adding flock to binary invalidation
Start work on Repository object.
modified:   globalvars
Cleaned up unnecessary declarations and changed paragraph fonts.
Added a clear selector and both declaration to the footer of the document.
Added $.fn.tipsy.revalidate() to remove dangling tooltips from the DOM.
Update README.md

Removed forking section of readme for now (see #124)
Fix wayward requires.
Add new command Raid Warning#1
swingin kanssa tapeltu, väliaika push... tappelu jatkuu
we did some stuff
Added sim foundations, mesh loading
Protocol translate to Chinese, 35% complete
Added spaces description and repaced prettify with highlight.js
Fixed checked background behind spinning hallway. Now it's white instead. Not
sure if that's much better, but at least we can control it.
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/Chapters/000-prologue.rpy
Add the archive view to the UI
Prepare for release 0.8.5
Voir les photos fonctionne, par contre pour le moment j'ai un petit souci incompréhensible qui fait que je n'ai qu'une image à la fois par utilisateur, mais je regarderai. Commentaire ok aussi.
Voir les photos fonctionne, par contre pour le moment j'ai un petit souci incompréhensible qui fait que je n'ai qu'une image à la fois par utilisateur, mais je regarderai. Commentaire ok aussi.
LOT OF THINGS
refactoring: 1) add repos 2) update the system 3) install
fixing performance on vimrc
removed old path for fugitive
adding images for new testis
Validation on tasks schedule.
Some fixes on import data and fixtures.
Added croniter as cron based scheduler.
Working on machine copy view.
Add analog input + la input sim files
Greet user by name, not email, if name is set
Remove pethau
Bump mocha version
Remove comment from Contact form SCSS
Added demo_jchan for visualization BAD MOTHERSSSS.
final game done!
Fix typos in variable name.
Category Slug for Single Posts and in general.
Fixed add post link to preface with url
Merge conflict anyone? Another button fix since it wasnt using admin_url
Fancy cursor on range input
Missing space
Merge pull request #148 from mattvagni/dev

Category Slugs & Add Post Btn
S69/S70 fix syntax, kmodules unload, enable syslog klog in ffweimar_adhoc
kalua: removed dmesg dependency
fixes to git console
added debug into reporting
trick to prevent suite hanging, i.e. report done while browser window is not closed
Set db server to app1
Some httperf (read-only) results
Switching memcached to point to DNS name
Not showing image thumbs for summary listings
Updating deploy.rb for 4 app servers
Merge branch 'master' into optimized
Return denormalized field instead of performing redundant expensive calculation
17032012-1
17032012-1
added solution of 1
completed solution 2
completed solution 2
Updated the courses and category logic
QML files moved to src/qml
Added gitignore
Refactor: Removing hardcoded style code
Project files created
qsviewer: bootstrap
qsviewer: Open file and load presentation
qsviewer: Load presentation from command line
qsviewer: cleanup, QActions added
qsviewer: Recent files
Quickshow2pdf class
qs2pdf: work as a separated process
Integrate qs2pdf into qsviewer
A first (and simple) example
move tidyplate
検索と詳細部分のテンプレートを修正
Merge pull request #12 from getbusyliving-or-getbusydieing/fix-template

検索と詳細部分のテンプレートを修正
check for email format, user_mgmnt
playing around in user_mgmnt, add user_add_validate() and minor stuffs
save after loong delay
making a few wrapping operations more safe
[maven-release-plugin] prepare release geocaching-api-1.5.2
first cut at HL7 support
.xmonad
IP models and middleware
nightly update

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/branches/B2_5_Release@57445 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Alternative fix for CORE-3034 (Bugcheсk 300 (can't find shared latch)), see also CORE-4004 (Sometimes long-running operations cannot be interrupted by asynchronous shutdown / cancellation requests)

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/branches/B2_5_Release@57446 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
OS-1617 mdb_printf()'s "%H" misprints integer values larger than 64K
OS-1561 mdb_v8 should display JSDate objects
OS-1562 mdb_v8 should differentiate objects based on constructor
OS-1563 mdb_v8 generates spurious warnings on some fields
OS-1564 ::findjsobjects can avoid many one-byte mdb_vread()'s
OS-1601 mdb_v8 should be able to print objects with dictionary properties
OS-1618 mdb_v8 should quote strings when printing JSON objects
OS-1626 tar -C support on extract would be nice
Reviewed by: Robert Mustacchi <rm@joyent.com>
2869 duplicate packets with vnics over aggrs
OS-1209 shutdown of a zone can silently fail *sometimes* when a zone is still starting up
OS-1643 improve comments for svc.startd
OS-1643 improve comments for svc.startd [fix unicode backtick]
OS-1366 add support for BCM 5719, 5720, and BCM5784M chipset
OS-1634 svcs -ZL does not work when a pattern is specified
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec

Conflicts:
	usr/src/uts/common/io/bge/bge_chip2.c
	usr/src/uts/common/io/bge/bge_hw.h
maintains a single js file without version number
precompiles activea dmin assets
Corrected aspect ratio\nAdded debug matrix axis viewer
initial commit
Merge branch 'master' of https://github.com/attheodo/katina_node
configured package.json for npm
finished function to scrape App Store. Figuring out the proper path down the XML to populate the final dictionary
Added a new Colorize effect.
Merge pull request #169 from ubick/develop

Colorize effect by sadlig
Revert reset cooldown for Duel
remove Arma2NET and CBA, update BAT files
add schema 0.07 (convert all pipes to commas) and remove all pipe/comma replace calls
merge all blisshive SQF changes into dayz_lingor
inline CBA string/array manipulation functions
remove references to CBA functions
no fucking way that make clean all will not work
Merge branch 'master' of github.com:azram19/trading-game
update the shortcut and color
打包后不带 servlet-api.jar
a rel and add post guide
Add questions about http
Fixed MapQuest Open Aerial linkrot. Also, MapQuest tiles are JPEGs, not PNGs.
Merge pull request #70 from balrog-kun/master

Adding the "Masstracks" TMS background entry for Poland
Localisation updates from http://translatewiki.net.
Add all the short cut keys to the help dialog.
Show the shortcut key (J) for Merge Ways text in the toolbox.
Add an even simpler test webserver setup using python (no need for ruby to be installed on your system)
Recommend server.py since python is installed on most Linux distributions by default
Merge pull request #72 from rnorris/Help

Help
Merge pull request #71 from rnorris/PythonWebserver

Python webserver
Localisation updates from http://translatewiki.net.
Where is it going?
Localisation updates from http://translatewiki.net.
Expand designation= help text and reword label
Make save icon less aggressive for the shrinking violets out there
Make help tooltips more obvious
New help icon
Localisation updates from http://translatewiki.net.
Localisation updates from http://translatewiki.net.
Don't throw an exception if user has disabled SharedObjects
Use new more accurate bounds of OS OpenData Streetview
finally sorted log_in testing
Fix use of query string in non pushState browsers

When setting query string parameters in non-pushState browsers
the query string parameters kept getting appended to URL and
were therefore not read correctly.
changed repo to org
add xss protection
Merge branch 'feature-xss' into develop
Introducing Code

Committing progress so none is lost.
break build on perpost
Update setup/bootstrap.sh

Fixed stupidity.
Explained tag normalizing and scoring.
play ...
fixed null pointer exception when no operation was found
added sounds to switchboard world.
Remove local run records when the webservice rejects them, because that means there's no point retrying them.
v0.13.7 - A new --silent option; fail immediately on source load; add sparkle support to .app; update xcode tools deps; lots of spec refactoring.
Add Babushka::GitAbilities, with .checkout_can_detach? ('git checkout --detach' was added in v1.7.5).
Only use `git checkout --detach` when the installed git version supports it.
Resolve refspec to a sha hash to gaurantee detachment
Merge pull request #219 from richo/patch/gauranteed_detachment

Resolve refspec to a sha hash to gaurantee detachment
Richo's resolve method works for every case, so GitAbilities wasn't needed after all.
Fix the GitRepo#resolve! spec -- it was trying to checkout a nonexistent local branch.
v0.13.8 - GitRepo#detach! works on older versions of git now.
Add Fancypath#read!, which raises if the file doesn't exist (like Pathname#read).
6 months should be enough for this one -- revert "A log message about the source updating behaviour change."

This reverts commit 1db4899ac99f4698696aea5ac235d005ab380d13.
Brackets.
Add #removed! alongside #deprecated!, which prints the deprecation hints but raises instead of continuing.
Remove deprecated :optional option from #render_erb.
Remove deprecated methods scheduled for removal, converting them to use #removed! (i.e. still printing the deprecation hints).
De&recontructed wp site for rails
Merge branch 'master' of https://github.com/benjohnstonsf/clover
Data Type updates
Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Vue

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
added logging statement to lamson decorator to store replies
fixes logging body of email
fixed error and added separator
storing the full message
Fixed merge remnants in mail
disabled pre-load data in the user autocompleter, fixes the missing names in the autocompleter
fixed a bug in the autocompleter where autocompletion data was loaded only once
Merge remote-tracking branch 'askbot/master' into wa2-work