labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed defective cloning in ext/intl classes

See also bug #62915

Cherry picked from 886a50a (I forgot about 5.3)

Conflicts:
	ext/intl/spoofchecker/spoofchecker_class.c
	ext/intl/transliterator/transliterator_class.c
Merge 5.3 with strategy ours

* origin/PHP-5.3:
  Fixed defective cloning in ext/intl classes
updated mpir version
Merge branch 'PHP-5.4'

* PHP-5.4:
  updated mpir version
  Fixed defective cloning in ext/intl classes
- Updated to version 2012.4 (2012d)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
- Updated to version 2012.5 (2012e)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Merge branch 'master' of git.php.net:/php-src
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
- Updated to version 2012.6 (2012f)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
Merge branch 'master' of git.php.net:/php-src
Moves modal window up
[#35680209] Added spec for tube integration
[#35680209] Refactored the tube specs to use lab_resource_shared
[#35680209] Refactored tube spec using shared context
[#35680209] Incremented core requirement and modified tube_spec

Creating an empty tube was supplying an empty aliquot parameter
which should not be necessary. The parameter was removed.
[#35680209] Tube resource uses receptacle
Merge pull request #22 from ke4/35680209_write_tube_specs

35680209 write tube specs
More simplifications to the proof.
"mecab-additions"
Added a new proxima weight and slimmed down the typekit file
make group of files configurable
Added chmod and chown functions
cleaning up a bit. lots of old scripts that aren't used anymore
trying to make it a backgroundable process to rotate wallpapers but it
isn't quite right yet. still works normally though.
Changing build to original sources
taxi2team1 überarbeitet
Create gh-pages branch via GitHub
Merge branch 'gh-pages' of git://github.com/schoam4/try_git
add picks page
MASSIVE code overhaul. Lots of things not proper right now.
Re-coded the helpers (turrets and traps so far).
October Edinburgh
Use checkbashisms from Debian's devscripts.
SCUMM: Add debugInput opcode difference in Backyard Basketball.
TEENAGENT: Readd the zlib code, to maintain backwards compatibility
DREAMWEB: Correction of minor conversion mistake.
PORT: few minor fixes to meta file of samsungtv
Animation attribute for items (static, horizontal or vertical)
Local images for horizontal & vertical
add sanityinc-solarized
- Updated GUI
- Fixed an EPerF bug
- Restored DB
Add spork and guard to run test easier and faster locally
Change hash sintax on home specs
I added a frequently asked questions page.
20120809_5
Réorganisation des controllers
Setting message in queryparser.lemony for failure of NEAR queries
vimrc add more keymappings
Neues Steckesdesign mit Stecke, Gras, Schotter, Reifenstappel(Begrenzung)
Kleine Änderung in Physics. gibt nun nur noch Max_Speed nicht meht Max und mIn speed
change to use 5.010 features; new options
Eric's changes
Merge branch 'master' of https://github.com/seungjoolee/GCP
Directorios contents e images vacios
README: clarifying a few sentences
Updated to runtime v1.6.89.0
Implemented the new versioning scheme
added version of node and npm to package.json
Vim debugger
Vim space
Swapped BG toggle
Change set paste binding
Add tabularize binding for =>
changed address
fixed typo
add and return JobsQuoteResponse
renamed Physics.h to PhysicsWorld.h, since it defines the PhysicsWorld class
Merge branch 'datatypes' of github.com:shewu/h4ck4th0n into datatypes
add Sugar.java & Konoha2.java
Use lazy require in effect
rename calculated into item_derived
problems
protein translation
Agregamos nuevas funcionalidades para la carga y eliminación de la base de datos.

- Movemos el archivo prepare.sh a Makefile
Auto VBV settings

Signed-off-by: Lucien <astrataro@gmail.com>
Newline added to eof
Standard set function name changed
Social set function added
Usage updated for social set
Demo updated
Added the Framework to App real path and relocated its configuration to the bootstrap.  Also added .htaccess and properly configured the URL module for cleaner URLs.
Fixed a bug in creating a new poll when there are not yet any polls.
Merge branch 'master' of http://github.com/sizzlelab/kassi
Made chairs disable themselves if they do not work on X minecraft
version.
Replaced most Sign instances with ChangedSign.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Made pling sound even quieter.
Fixed cart reverser for recent versions, and gave station more pushing
power.
Wifipasses.
Gitignore.
Disable annoying history expansion.
Add problem 31.
Improve benchmarking.
- converted lobby page to JSP
[ISSUE] roborace-4 - JavaScript unit tests on DOM model
- fixed existing tests but couldn't get dom model events to work within QUnit
[ISSUE] roborace-4 - JavaScript unit tests on DOM model
- dropping tests until we find a working solution to test with DOM and events
xserver session scripts

the .Xresources uses the colorize palette to set xter base colors.

color-test is a sample script taken from the arch wiki. Display
a table with the ansi color combinations for the current xresources
and terminal color setup.
xmonad config file from the xmonad documentation
ssh-agent conditional launcher function

ripped from: http://superuser.com/questions/141044/sharing-the-same-ssh-agent-among-multiple-login-sessions
update things list when calling the ssh-agent
update machine names and paths in .mrconfig
clipboard helpers on xinitrc

parcellite installed for the clipboard history. X selection is available
as Shift+F12 after re-mapping F12 to Insert.

shift+insert is the historict shortcut to get the X selection, complement
of what sselp does.
minor updates to irssi config

mostly channel subscription update, banners, and nick info
conkerorrc with github & duckduckgo webjumps
helper to mount old hfs partitions
xmobarrc and ordering of files in rake
track ml-course repo with mr
typo on mrconfig squeeze-powerpc branch name
wxtoctave alias to enable interactive terminals

with wxt terminals octave plots are readable
dirty commit with dock struts back to xmonad

xmobar broken :(
remove extra comma in xmobarrc
merge l0l16int and tarena--squeeze-powerpc

as a starter point for xmonad configuration on arch
auto-install *anything*.el
elpa
Modify README
wanderlust debian
org
yatex
window move
Modify
Modify
Modify
Internet
anything
browser
edit
Fonts
fix output on blank file input, previously produced invalid javascript, now it produces a valid file
changed application.html.erb for css on heroku
switch zlib to better download url
starting to add or filter
Budget screen added two files
Small changes and removed some redundant infos from about page
Add a StaticPages controller
thru 3.2.2, +fixes to previous commit
Finish stataic pages
Make multipart parser work when there is no Content-Length header

Closes #418
support fetching OAuth tokens from HBase via Stargate (HBase REST interface)
removed echo code
[socket-api] Adding `end' implementation to socket
[socket-api] Typo from the past!
[socket-api] Rough finish for the socket class
+ Creating default initial OS socket for hinge::socket instances
+ Implemented connect, but it's not async
+ Guarded the read handler from attempting a read on closed sockets, emitting a close instead.
[socket-api] Adding an examples file.
[socket-api] (end (socket)) => (close (socket)) rename
adding selector
adding static value
registration patients for staff and ui sstuff
fixed installation instructions for go1
cmake: fix libevent2 detection

 - use CheckLibraryExists
 - event_base_new (function) instead of event_new (macro)
cmake: Replace install_targets with install

 - install_targets deprecated
 - install available since cmake 2.4
allow overwriting GIT_VERSION for building without git
Add --version to print git id
step1.04
Attempt to work around the magic project duplication
Converted to rst file.
Cleaned up readme.
Added missing import statement.
Merge pull request #1 from dreamhost/master

Cleaned up README (looks good to me, thanks @oubiwann!)
Upgrade naar CKEditor 4.
Link voor tonen rekening in financiële gegevens alleen beschikbaar gemaakt als er rekeningregels ge-upload zijn.
try even harder to fetch contents
invalidate cache even if passed a hash
shuffle before spawning
activity feed changes.
Made KeyAndClass for ImageConverter generic, added test for visibleToAuthenticatedUsers flag in SecurityContext.
compiled with android ndk r8c, fix jpeg compile error
changed jlist management, added button
yellow fu
Update app/models/material_type.rb

has many collections
Setup fixtures for ObjectFiles.
Setup spec for ObjectFile
Render our own signin form in place of devise provided partial.
Turn APO roles into drop down and style the person/roles section.
cleanup deploy scripts to remove duplication between various environments; put common elements in deploy.rb instead of environment specific deploy files
player who does not bat should have runs set to -1 to show him as NP
Extension to render to rename id

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19529 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
get_focus changes

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19530 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
get_focus on view_person_detail

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19531 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
prefix/suffix updates; working on editing person

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19532 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
New template for surname editing

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19533 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
0005785: print statements in Check.py causing a crash in Windows (pythonw.exe) after outputting 4096 characters. Setup logging in gramps.py before anything else; for Windows divert stderr/stdout to a log file; use logging instead of print for errors or warnings.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20014 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Update to current trunk.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19211 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Pure-Python PNG reader/writer under MIT License

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19874 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
gem update and better js for flash
updated readme
XMonad: Update screen capturing hotkeys to new api.
Cleaner check for closed pull requests
Updated access example and schema
Dates as proposed in eadReision
Classification rough draft
alternativeSet
beta version completed
Update README.md

typo
Update README.md

typos
Merge pull request #3 from svassallo/dates-classification-alternativeset

Dates classification alternativeset
always include js.Boot for DCE (fixed issue #693)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4250 f16182fa-f095-11de-8f43-4547254af6c6
simplified haxe.Timer in JS

git-svn-id: http://haxe.googlecode.com/svn/trunk@4295 f16182fa-f095-11de-8f43-4547254af6c6
forbid initialization of extern var fields unless they are static and can be inlined (fixed issue #1294)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5602 f16182fa-f095-11de-8f43-4547254af6c6
redirect commands output to client when using server mode (fixed issue #1283)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5603 f16182fa-f095-11de-8f43-4547254af6c6
Merge branch 'master' of https://github.com/SparkDevNetwork/Rock-ChMS
gen DB
Merge remote-tracking branch 'origin/master'
cleanup develop
emulator: fix incorrect handling of IFx instructions

- operand decoder is side-effecty, so skipped instructions
  that modified SP still modified SP
- ditch the "skip" register and instead add a simplified
  instruction decoder for skipping instructions
- tidy up some other details of the main emulation path
- grumble about non-uniformity of the instruction encoding
  (a must be decoded before b, but they're different fields
  in the two different instruction formats)
had wrong app tree
Refactored run configuration settings code, and fixed a lot of bugs in how the debugger was setting it's paths. Fixes #108 #106

--HG--
branch : idea11
Added tag 1.0a41 for changeset 10752005607a

--HG--
branch : idea11
Added an equals method to the LuaLookup to help prevent duplicates in the list. Also a special lookup for global suggestions that are only from a nearby usage.

--HG--
branch : idea11
Fixes to the color settings

--HG--
branch : idea11
Tweak the file utility functions

--HG--
branch : idea11
Update for 120.x builds

--HG--
branch : idea12
Fix IDLua-806: java.lang.NoClassDefFoundError: com/intellij/util/TimeoutUtil	at com.sylvanaar.

--HG--
branch : idea11
Fix IDLua-800: java.lang.StringIndexOutOfBoundsException: String index out of range: -1	at ja

--HG--
branch : idea11
Add transparency to icons

--HG--
branch : idea12
fix copyright options

--HG--
branch : idea12
Fix NCDF for PersistentLibraryKind in plugin loader

--HG--
branch : idea12
Fix ant build to include optional dependency

--HG--
branch : idea12
fix another NCDF for Lua modules in directory projects

--HG--
branch : idea12
Update for 122.x builds, versoion 1.0a42

--HG--
branch : idea12
Merge in idea11 changes

--HG--
branch : idea12
Added tag 1.0a42 for changeset 326046249003

--HG--
branch : idea12
Fix string literal dequoting

--HG--
branch : idea12
Dont return invalid aliases

--HG--
branch : idea12
Added support for resolving require to modules

--HG--
branch : idea12
[Routing] removed cyclic reference Route<->CompiledRoute
merged branch Tobion/compiledroute (PR #5326)

Commits
-------

4f57d69 [Routing] removed cyclic reference Route<->CompiledRoute

Discussion
----------

[Routing] removed cyclic reference Route<->CompiledRoute

BC break: yes

I think we should remove this proxy behavior from CompiledRoute. Cyclic references are often not a good idea and in this case it doesn't even make sense. It's like an integrated decompiler ^^ when going from CompiledRoute -> Route.

It also conflicts with the single responsibility principle in OOP design as you would need to change the CompiledRoute class whenever you change the Route class.

It also mitigates problems like
```
$compiled = $route->compile();
// $route is change by some other layer
$compiled->getRoute(); // is not in synch with $compiled anymore although this getter makes us believe that
```
Added Croatian validator translation for 2.0
merged branch aubx/croatian_validator_translation_2_0 (PR #3676)

Commits
-------

d42ae47 Added Croatian validator translation for 2.0

Discussion
----------

[FrameworkBundle][translations]Croatian validator translation
More work on Kinen temperature controller device
342.01 Added Studio4 and Studio6 project files to support
journalctl: reset cached column count on SIGWINCH

This requires a little bit of tip-toeing around to explicitly avoid
touching the environment from a sig handler. Instead, simply create a
function to reset the var to its "unset" state, allowing the next call
to columns() to recalculate and cache the new value.
journal: set seal even for readonly journalfiles

journalctl needs to know wether the file has been sealed to
be able to do verification.
util: don't export parsed_columns
FilterSet is now OR connected, instead of AND
Fix: Save-Button of EditableTablePanel is invisible by default
Dithermenu -> Options-Menu, only visible for 1 MappingSet
increase the cost of the grounding operator
add social domain benchmark with evidence
update scripts
Redo section 5.3.4 tables.
Work-in-progress on dual pinning.
Client processing for dual pins/tacks.  Also, trying l->8 base32.
Cleanup pin activation text.
More text on rollover, reworked pin activation again.
More fixups for rollover / dual-pin text.
Changed from current time -> (Tmin, Tmax)
Revert "Changed from current time -> (Tmin, Tmax)"

This reverts commit 6cae0a2b8ef959bb60b92d786929219359e2e9cc.
Various minor text edits, some were part of prev. revert.
revamped UI a little consolidated into league page
The packing slip index screen was added and some amendments.
compatibility check in agp v2.0
changed the pre style
Fix HTTP Basic Authentication
Merge pull request #9 from vstoykov/master

--auth option Does not work
Add FAQ and reviews to tutor show page
grails app with JAX-RS -> Mongo api
Rescue an openssl exception
Remove dropbox.py and update rebuildblog to pushwebsite
Update note script, remove file extensions, delete unreadcount.py
Remove testEnvironment stuff from the "binary" release.  Also ensure that the testEnvironment.zip ONLY gets built if the testEnvironment.xml exists, and that we have Unit Tests DISABLED by default.  These two latter changes ensure binary releases build correctly without any testEnvironment stuff.
styled a bit closer to existing sample
[tengine_jobのrubyジョブの受け入れテストを作成する]実行中のジョブが終わるのを待たないといけないので待ち時間を増やしました
[tengine_jobのrubyジョブの受け入れテストを作成する]タイムアウト強制停止のfeatureを追加しました
allow to create an ets table with specified options
dump: makeNumReader should care about the actually read byte num
Updated evaluation figuers with spec(when=rv.POST)
Changes \bar{} to \neg in formalization
Rewrote and restructured the Approach
setup speach to text
Added FooterView.
+ OpenStruct#to_h
a simplified version of procedure \'eval\'
#18 Migration to twitter bootstrap css/js
Statement item edition
Combined Welcome Xmas music tracks to one
Re-added setBgHeight function
Whitespace diff…

#296
Update src/intro.js

Use an outer closure for caching window / document / undefined rather than trying to combine with AMD factory function (though simpler, it may cause some problems)
Added changelog item for recent pull request merge.
Adding JP2 mimetype definition, which doesn't appear in the Travis environment.
Рабочая форма КОНТАКТЫ
bugfix. on logout
Removed dependence on improve.
Testing
Merge branch 'master' of https://github.com/tomayac/isearch
GRAPHICS: Added graphics/decoders/ilbm.cpp annd graphics/decoders/ilbm.h

Added empty graphics/decoders/ilbm.cpp annd graphics/decoders/ilbm.h in preparation for a new ILBMDecoder
Updated graphics/module.mk to also include decoders/ilbm.o
Fixes done at SofTube + some more:

* added WgGizmo::_queueEvent() for more robust handling.
* WgFlexGeo::DefaultSize() now returns calculated size.
* WgGizmoView has now more flexible handling of scrollwheels.
* WgPen now defaults to NOT show space and CRLF characters.

Signed-off-by: Tord Jansson <tord.jansson@gmail.com>
playing around with some primary font sizes and css columns
Renaming variable to make it, you know, refer to what it actually is.
Controls for mass companies deleting
small fix, removed second --out
Deactivate macports zsh plugin, celebrating total
conversion to Homebrew.
.tigrc color modified
wrote initial spec tests
Add auth token config
brackets slaider

brackets slaider in file 1.htm
Para testar
fix debian installation script
recreate feature for contact us menu link. Jex
Pants bugfix.
Get rid of a bad ivy repo reference.
Merge pull request #67 from benjyw/master

Pants bugfix
Update LocalPackages/NameSystem/auto_include.ms

This change corrects the issue where players may use colors 0,4, and c by fixing a syntax error.
start the ruby version
.gitignore + TAGS
Merge branch 'master' of https://github.com/tzaeschke/zoodb.git
TODO-Tags
Updated TODO
Implemented READ statistics
Merging
Merge branch 'master' of https://tzaeschke@github.com/tzaeschke/zoodb.git
Statistics and commit-performance
Merge branch 'master' of https://github.com/tzaeschke/zoodb into profiling
Dirty hack: Let ProjectViewController handle requestDidFinishLoad only once. Show message if timeinforequest failed
Several things:
Add splash screen that shows ajax progress.
Make botlist independently scrollable on overflow.
Make botlist no longer toggleable.
Make sliding animations 20ms longer.
Add 'selected' class to the selected bot.
Add bot's nick to infotable.
Show free slots instead of used slots in infotable.
Add packsum to botlist.
Parser won't repeatedly download the same packlist (uses uri to determine uniqueness).
Right-align numeric table entries.
добавил справочник операторов, изменил корректировки по подобию платежей
Ajuste no gemfile

foi fixo as versoes de cada item no gemfile para evitar erros no mac e
no linux devido a mudanca e atualizacoes no repositorio do rubygems.
added permalink to allow easy sharing
worked on better footer
Доработка поиска по тегам 19.12.2012  21:35
Symfony2 book, chapter Testing 1
a list?
Fix syntax errors and implementations.
Removed const int&
Update src_list, vector2d to use cmath
Update math.h
initial commit masstxt.py
Update masstxt.py
Added directories
added directories
Tell people to be scared of my code
remove virtualenv from bashrc
added browser() to open hmtl from cli
Somewhat fixed rounding issues of drawing grid lines (only fixed X-Coordinate camera for now)
some stuff
style merge
some functions output of AsyncTask
fixed logging error and ignore pitchers
Change default time level
Fix Time initialization
Fix Time header
Add unit tests for Time
Update articles/Apocalisse-2-e-3:-le-sette-lettere-alle-sette-chiese.md

Minor changes to the header titles.
aligned the three host names in readme.
[fix] path.exists was moved to fs.exists
Merge pull request #9 from node-migrator-bot/clean

Hi! I fixed some code for you!
Added success return code
Added debug output
http statuses refactoring
add GiftMapping
'Transformer l'outil d'infra en bibliothèque' complété
only show dir if i'm on a different host
table of contents wasn't generated...
+ ...
+ change default.profile
+ more debug ...
Organize imports.
Update unstable update site with a few minor defect fixes.  Vrapper
should now work in Eclipse 4.2.
updated shebang to point to python2 explicitly; cosmetic change in changelog
included updated elastic search module
jQueryified Some popup code on the main page. Should simply future development
Merge Resolve
Merge pull request #90 from matrix10657/jQueryify

jQueryified main.html popup code
Small font for messages
bit of a mess still
should have git mv those files...
RETGER

ZCA
remove tiff imgview case
Fixed stupid mistake

Had something to do with prints and crap...
Whitespace.
Don't waste time.
Updated welcome page links, minor fixes to tab
Template 01:
- Creating the header
  - Right part of the header is done already.
added license file and README
search topic and topic reverse time order
Merge branch 'master' of https://github.com/weilongw/Breeze
Added new grammar transforms

Added a grammar transform to identify which array are being used in what
ways, and to collect all those which are being used.
layout
Add cloud foundry plugin
Update REST requests
WIP: Make Capistrano WORK (with database.yml, securely)
使用fmod播放声音

Mac下不用禁声了。。
Readme.
Pipe man pages into files.
Modificado arquivo Readme
I had to :)
package
fix flash of hidden textarea
kitchen sink gets its own set of themes
package
"Info" icon for gutter was still missing.
move scroll top and scroll left into the edit_session
so they can be persisted when changing sessions.
package
scroll events are now on the edit session
package
Merge pull request #589 from ajaxorg/info-marker

"Info" icon for gutter was still missing.
package
fix tests
fix typo
package
Undoing the change that broke the firefox. onmessage is not a local variable, it's a global one.
fix scrolling issues
Merge branch 'master' of github.com:ajaxorg/ace
package
Fix cross-domain worker load issue.
package
pytrie maker now works.
Merge pull request #469 from wkollernhm/master

PI tool updates
Updating SMT to use v1 OLEF
Updating travis ci config file
fix resize on clear
travis jvm has issues, disable for now
pep8 local.py-dist
Front end for PIN (bug 795115, bug 795118, bug 795120)
buffered zip import files
Merge branch 'master' of github.com:wscullin/collfs
walla (mpiimporter) is working on Shaheen
login ui change
Slick...
Update server/uploader.py
Window hierarchy update
Multiclient
Merge branch 'master' of github.com:xbadcode/Rubezh
Fix logging.

Signed-off-by: John Else <john.else@citrix.com>
CA-81449: Take VCPUs_at_startup into account when starting a guest.

Previously we were creating all the CPU devices as online.

n.b. adding the "online" option to Device.Vcpu.add means it's
functionally identical to Device.Vcpu.set

Signed-off-by: John Else <john.else@citrix.com>
Merge commit '073e05e3a485bd2b11d56db229d414a9ff35d11f'
Merge branch 'addform'
Programming_Language_Comparison_Report
Merge pull request #173 from dochoul/master

프로그래밍 언어 비교 과제 제출합니다.
A quick fix to issue #456.
Update README.md

add readme info
ad
Merge branch 'master' of github.com:xiongyw/xiongyw
Rules added to design ruleset.
Basic hardware decoder code
Expand inline block

* Inline block used over multiple lines, so using expanded format
* Correct test description error
Integrado com JMS.
Auth2 fonction done
radio module import completed
alter bl_api.h
zkxy pkts num
add ip_analyse
modify boundle id
Merge branch 'master' of github.com:yenchiugu/Desco
Merge branch 'master' of github.com:yenchiugu/Desco

Conflicts:
	.gitignore
fix download msg
updated comments to strip HTML tags
readme for github
image file for Tower, huh, looks like praying now that I think about it
Bottom I shows video info
12 new building type switch cases completed
modify LICENSE in generated lib
Added async.py
Experiment with local only affecting UTC times
There should be one -- and preferably only one -- obvious way to do it.
First commit of Gill Essay
octave 3.6.2
getmail 4.27.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ffmpeg 0.11.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
MonetDB 11.9.5

Compilation of rubygem is disabled as it breaks the installation of the
formula.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
samba 3.6.5

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libpurple 2.10.4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
percona: Use SHA1 instead of MD5

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
pow: add launchctl instructions

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
portaudio: fix pyaudio compilation in Lion
OpenCV 2.4.1
Emacs 24.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ipmitool: fails with clang
cmu-sphinxbase: require a Homebrewed Python

Compiling against system Python causes a compiler mis-match.
This can be worked around, but as a workaround suggest using
a Homebrewed version of Python instead.
pocketsphinx: fix compilation with clang

Fixes are already upstream.
TinySVM 0.09

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
nlopt 2.2.4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
liblinear 1.91

LIBLINEAR is a simple package for solving large-scale regularized
linear classification.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
akka 2.0.2

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Griffon 1.0.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
emacs: remove cruft

 - Now that 24.1 is the stable release, everything builds with clang.
 - Clean up patches method a bit

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
add size() and has_key() to ConfStruct
BLACKTIE-415 fix to check apr_thread_cond_timedwait return value
BLACKTIE-416 added pull message handling
edit gitignore
ignore .idea
using a different conenction manager for feed crawler source factories
building the writer
增加书柜效果，展示学习资料
videoStand
changed default texture scale
added sky and background to maps
Support unregistering Lua environments
mod_survey: missing quote in .po file.
core: remove superfluous {host, ...} site option
doc: ported over deployment, cli, etc.
doc: typo for sort filter.
Closing directory handler after use
fixed it on mobile too
updated hover styles
Update reveal to hide embedded videos better.
add the display bug at the header of page
add contact-link ico
Added http://jonisalonen.com/2012/your-bash-prompt-needs-this/
Set body as ana empty dict by default
Renamed folders and files emacs improved (EiM?)... have a nice day!
Initializing Project

Base code from VS
Adding areas to the MLS gem.
make confs enabled
Succesful Julia build modulo src
Updated Julia source to the fresh working version
Slight change to bauhaus popup borders

The old way of drawing them looked like a bug to some users.
maybe fix dup/rm/dup issue, or half of it.
rawspeed: vendordropped v489
Revert "remove nikon j2"

This reverts commit 709448cb0e5ae49fb9d2b1d066b6b85125944bab.
usermanual: small technical updates on several modules
usermanual: some more minor updates
simplify code a little
autocrop is now optional, so we can define cropping area by ourself
scale keystone before apply
direct check if the move point is correct
no verification anymore on the fly.
We just ensure that roi_out is not too small.
some gui enhancements
Merge remote-tracking branch 'upstream/master' into key
params version upgrade
handle old keystoning system in gui
BUG don't display all sym icons if keystoning is not full
Added bounds check to INC "$string" "value".
Fixed txt2hlp issues introduced last commit
[Change] Just tweaking some colors, too lazy to do anything else.
Exporting of contacts has beem added
Merge branch 'master' of http://github.com/Alok-Sharma/resQ
Reverted back. Code became unusable. I will have to rebuild this to be cleaner. Code still works like the intention. But, it is just not dynamic like it should be. :(
get Login
merge with Maneesh code done
started tracing harvest robotics logo
User.toString()
remarks and symbol to idm
update active record
Merge branch 'reengineering' of github.com:openforis/collect into reengineering
save active record function
Added ContextRecord (RecordManager implements ContextRecord
validation logic
added null value check
added null values check
moved logic into presenter
code clean
added null values check
creation of empty attributes when creating new entity
attribute data group header width can be different from that
of input field
null values check
Merge branch 'reengineering' of github.com:openforis/collect into reengineering
renamed presenter class
reload record summaries current page when coming back to list
added generic AttributeFormItemPresenter class
utility methods
Added Inventory Manager to handle shared ammo
Added Bullets for ManaRifle Basic and Fire
Added PickupFactory for ManaRifle Ammo
Added Ammo to HUD
Core/Pets: Remove _currentPetSlot change for non-hunter pets. Fixes crash.
Merge pull request #491 from roc13x/master

Pets crashfix attempt
Core/Pets: One more crashfix in pets
* And a crashfix for Glyph of Polymorph
Merge pull request #492 from roc13x/master

Core/Pets: One more crashfix in pets
Core/Spells: Adjusted aura definition.(330)

Core/Skills: changed calculation of the chance for gaining fishingskill points
DB: Corrected "56473" scriptname, and added go_temp flag crooections for tents.
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU
Core/Quest: Fixed quest: 13890
Clean-up previous commit, it looked like hell.

Signed-off-by: Bootz <bootz@projectskyfire.org>
Core: Updated a few opcodes

- Still getting http://paste2.org/p/2018746 so more work needs done.
DB: multiple fixes;

* Updated some missing spelldifficulty_dbcs.
* Added missing graveyards in a few places.
* Corrected coords on some of our areatrigger_teleports, and added some missing.
DB: Added Gilneas waypoint data for quests(14212,14293,14465)

- wp's are for non-player controlled mounts paths.
- thanks to cataproject for this one, verified to sniffs
::thumbs::
Core/BattleGrounds: implemented battle for gilneas, and TwinPeaks (WiP)

- also made several packet adjustments for rated events and arenas.
- more work will have to be done in these two new battleground areas,
thanks to CataProject, MigCore, AlantissCore, and those that contributed during cactus.

Signed-off-by: Bootz <bootz@projectskyfire.org>
Merge branch 'master'.
Added movie last stand for worgen quests.
DB/Misc: Fix min/max lvl and Min/Max players on TP and BG

Signed-off-by: Bootz <bootz@projectskyfire.org>
Core/Battlegrounds: made some minor changes to TB/BG

and removed waypointScripts.sql for there no longer needed.
thanks to:  Darkpeninsula

Signed-off-by: Bootz <bootz@projectskyfire.org>
Tabs2Spaces
DB: Fixed SpellId for play movie.
thanks Walkum for catching that

Signed-off-by: Bootz <bootz@projectskyfire.org>
DB: Removed Call to Arms from world events,
- need to figure out the new bitmasks so we can use the
- "game_event_battleground_holiday" table for this.

Signed-off-by: Bootz <bootz@projectskyfire.org>
Battleground fixes
 BG
  - buffs
  - removed extra nodes
  - changed AB to BG on some stuff

 TP
  - database id for gates
  - miss spelling on alliance annoyed me

 IC
  - more gates
  - changing teleporters database id
  - made it easier to read

Signed-off-by: cheapgamer <pmfabing@sbcglobal.net>
mistakenly removed rep
Fixed two places where Mozilla-specific CSS properties were still being referred to with a small m in "moz".
fixed css problems with flash-notice
bring back lein.bat from LF to CRLF
Base class for Torrific.
修改demo 主要是判断
Merge pull request #304 from zhanghongyan/dev

修改demo 主要是判断
[Change]修改 baidu.dom.createElements 接口，dom.parentNode改成DocumentFragment
Merge pull request #130 from huangfangrong/dev

[Change]修改 baidu.dom.createElements 接口，dom.parentNode改成DocumentFragment
Separate video interface from its SDL implementation somewhat. Kill BlendUnspecified + getBlendMode() in favor of a default BlendAlpha if no argument is provided. Kill setBlendMode(). Merge hardware blending/color selection functions into video.h (TODO: actually make them members of a Video object. Also, somehow combine image and video code to cut down on places with messy GL calls).
Ajout de la ligne 200
Ajout du rafraîchissement automatique après d'1 minute
Lors du lancement de l'application, affichage de l'arrêt le plus proche
Uodate LocationManager
small fix
Put icons in a grouplist + revert sort button to a separate button
adjustments for fullscreenpanel, makin use of wall_bg now
texture improvement
Merge remote-tracking branch 'origin/master'
set imagecaching to true (don´t know what´s better)
Changes to make the orders page handle deleted items.
improve XmlLoader for maps' loading
create CellLoader and improve XmlLoader
update for clay changes
Fix unused variables
Fix warning: type qualifiers ignored on function return type
Add `without` method.
Add `values` method.
added formidable as deps
disable 2.6 testing
Final (for real)

Deleted existing bad folders and junk
Now with working data-logger
Merge branch 'master' of github.com:CINF/PyExpLabSys
almost works.  cp=00, i=00, tp=00
uh. massive derps. forgot to add users and groups.
Add send fire event
Issue 33: updated error dialog
Fixed Forwarding & Pausing on Tutorial
Merge branch 'tutorial_master' of https://github.com/Catrobat/Catroid into tutorial_master

Conflicts:
	catroid/src/at/tugraz/ist/catroid/tutorial/Tutor.java
Function replacement,
Mapping update
took out spinner for now, to many tests failing. waiting for design
team decision
Minor bug fix
Merge branch 'CatWall_NativeApp' of https://github.com/Catrobat/Catroid into CatWall_NativeApp
adam muppar

Signed-off-by: Adam Nyberg <adam.nyberg@gmail.com>
Anpassungen im Modul F
======================
- Logausgabe nur noch im Log ersichtlich
- Logausgabe verbessert (neu immer mit Vorzeichen)
- Fehler (XSD) wenn Differenz ungleich Null
Anpassungen im Modul H
======================
- row count nur durchfuehren wenn nicht unbounded
@author ceugster
Anpassungen im Modul H
======================
- Ausgabe einer Warnung in der Konsole, wenn eine Tabelle nicht
validiert wird
- Ausgabe einer Warnung inkl. Details im log, wenn eine Tabelle nicht
validiert wird
SIARD-Val v0.9.0 ersellt 
========================
v0.1.0 auf v0.9.0 erhöht
Remove IncreaseOSBuffers() completely
Replace printf(_c) with iostream
m_ssl_gnutls: Resolve deprecation warnings properly
Merge pull request #338 from ChrisTX/insp20+iostream

Replace printf(_c) with iostream
Merge pull request #274 from ChrisTX/insp20+gnutlsdeprecation

m_ssl_gnutls: Resolve deprecation warnings properly
vim filetype for coffee and markdown
oops, had to re-add lower
started switching violence.py to text files
Fix long unbroken string going outside toast

https://github.com/CodeSeven/toastr/pull/9
Add asuro.c asuro.h to project
clean up railgun regsiter methods
purge wasted call site result operation
use breaker::Context
add railgun option. This force to use railgun even if breaker JIT is enabled.
fix cxx11 flag
update README
Merge branch 'master' into breaker
Merge branch 'master' into breaker
Fix neg to INT32_MIN
Merge branch 'master' into breaker
fix delete String object length
Merge branch 'breaker'

Conflicts:
	test/lv5/test_suite.cc
Update breaker assembler include
Actually add the redistributed CCV library files to our version control
Fix detection to actually work
Got dockable panes working.
Exhibiting the bug in timers
Working on Clock/Trac
clock
Reverting to pointers
Reverting to pointers
Merge pull request #468 from dcoeurjo/BugInTrace

Bug in trace (Minor edit)
circle feature
deplacement pieces console sur commande de click
Merge pull request #5 from DamonOehlman/master

New once function did not pass on return values
Adding support for AMD. Useful when using requirejs or other client side commonjs libraries
Merge pull request #6 from jhinch/master

add support for AMD
Made eve.nt() stay in scope
Merged…
clear old counter values on flush, keeping the last sample
make expiration configurable so tests can pass
Merge branch 'master' into expire_counter_values
Merge pull request #245 from DataDog/expire_counter_values

Expire counter values
optionally normalize counters and rates to be per-second
update doc in datadog.conf.example
default to normalizing metrics in dogstatsd
Merge pull request #252 from dcrosta/normalize-metrics

Normalize counters and rates to be per-second
nameChange Ordbok -> OrdbokKjell
Gunshot sounds
Markdown files working in Vim

Was having issues with Markdown, this addition to vimrc fixed it (wish I
wouldn't have to do it in the first place).
Implement the KNOCK command
Fix exceptions
Let KNOCK take an arbitrary number of params
Remove knocked channel on join
Merge pull request #100 from ElementalAlchemist/cmd-knock

KNOCK command
Remove JDom dependency
Update NEWS
Format + Orga + Cleanup
WorldEdit 5.3 => 5.4.2
Vault 1.2.16 => 1.2.18
Version 1.1.2
Add the load_set_bin() function
Initial commit
Adding the source files
Setup django-celery.
Fixing imports.
Added tag field to rules output
Removed more xcode config files
Added sociallink
Added bashrc.custom to default bashrc
Ajout du module scrolltext
	Permet de faire défiler du texte à l'infini sans saturer le buffer (enfin j'ai pas testé sur très longtemps mais j'ai limité la mémoire)
	Facile à utiliser et à modifier
	python scrolltext.py # Permet d'avoir un aperçu

TODO: Il faut ajouter des paramètres (vitesse de défilement par exemple)
TODO: Ajouter une fonction de cryptage
TODO: Ajouter une focntion de décryptage
TODO: Intégrer ce module dans main.py
updated docs for 4.0.dev
adding search to layer_manager
bluechan.jp
changes for windows
Merge branch '2.0' of github.com:Eigenlabs/EigenD into 2.0
Fix permissions on this
add trove classifier for posix.
OC
more hashes
Added an alias to easily print the contents of plist files.
Add, yet unused, entity type names
§1 1.0
preisErmitteln(KindID) über DBConnector
Add xa state tracker support
Bug!!
test
Here are some textures
Merge branch 'master' of git@github.com:runningwild/haunts.git
modified openme
Merge branch 'master' of git@github.com:runningwild/haunts.git
Textures, furniture, ui and action icon tweaks
added jQuery-ui and demos
added events to readme
start police main page & 3 main police level
Fixed README. Deleted README branch.
Physics loading, fixed mouse
Commit, damn it
fixed some broken code
Done with calculating birthdays
Start rabbitmq manually after having enable plugins
Add support for compass sprites out of the box
fixed initial pair issue.
Add java play framework. Add Lukas 'code'
Added pixel @ player.x,y to trace movement and paths for upcoming update
Update a few styles and list supervisor as a dependency
ms support and tests
creating API for accessing by server
Move station_page and station css
Upgraded toolset to v110
Revised compilation on Windows
dance with tambourina phase 2
New Timer
Pushing...?
pushing...
Adding project
Updating....
Adding...
new branch...
First push...
Timer, iteration1
finished
First pass at api for manually constructing EntityType's on the client
x11-plugins/vicious: fix contrib path
Changing the home page,title of the page.
Log username on good login

Note that RoketGamer has a lot of work ahead of itself...
first commit
Merge branch 'master' of https://github.com/JamToshi/.xmonad
Remove eh_outer_exit function
Unused now
Move initialization of top-level classes into ehinit_GlobalObject
Remove trailing whitespace
Fix operator precedence
Add test
Small fixes
Add test for if
Trailing whitespace
Add example
Add test
Add test
Make switch an expression too
Add comments to example
Add in keyword
Add init into cakefile
Fix
Fix dismissed context menu clickstops on MSW
edicion de perfil
Merge branch 'master' of https://github.com/JesusKenji/ikela
Add IncrementalCompilationTest which test compiling kotlin files one by one in the same module (the order is predefined)

Add very simple test cases
Fix TestlibTest which was broken by the introduction of ModuleDescriptorProvider
libraries: adapt to single repository schema
libraries: deploy kotlin-compiler artifact
tests should not ignore jdk-annotation dir
unnecesary and confusing field receiverDescriptor removed
got rid of unneeded ReceiverContext
test4...
Implementing multiple rel-values in links.
Testing Atom link format.
More usings in tests.
Docs
Merge branch 'master', remote-tracking branch 'origin/master'
Fixed \n bugs
fixed bugs that prevented the server from working. This works with a client
and sends moves and receives them correctly.
Bind f5 to replace regexp.
Removed Thread constructor for now.
Do not call haxelib when compiling to cpp.
Added make batch files.
What is debug.conf?
ignore MLDepend files
Added OpenGL headers for linux
Removed rails logo
Disable header test due to lack of means of excluding a file

Change-Id: Ic62ce6d2e792cc81a1c6fa841537d501b0d56d23
Merge topic 'add_test_labels' into next

e381eb3 Disable header test due to lack of means of excluding a file
Updating version number to 1.0.0
Merge branch 'release/1.0.0' into develop

* release/1.0.0:
  Updating version number to 1.0.0
fix bug of viewinbrowser
Testing of scraping ride achievements.
added 'default' parameter to SpokeConfig class, all modules now use
config.get(key, value, default) format.
Please check this version for bugs
Added "play again?" option and made enemy attacks do damage
Merge branch 'develop3d' of http://github.com/mono/MonoGame into develop3d
Merge branch 'develop3d' of http://github.com/mono/MonoGame into develop3d
Merge branch 'develop3d' of http://github.com/mono/MonoGame into develop3d
Merge remote-tracking branch 'upstream/develop3d' into develop3d
Merge branch 'develop3d' of http://github.com/mono/MonoGame into develop3d
Remove the double attenuation on the volume of SFX in Android

I'm not sure why the music stream volume was used to as a factor in the SFX volume, but removing it fixes the issue where SoundEffects are played very quietly.
Fix sampler states
Fixes input for XBox wireless controller
Vertex structs ought to have StructLayout(LayoutKind.Sequential, Pack=1)
Fixes sensor delay issues related to blocking main thread (by content load for example)
Readonly
Readonly part deux
Merge pull request #892 from fragcastle/develop3d

Fixes input for XBox wireless controller
Fixes to Dispose pattern and disposing GL objects
- I believe this addresses all known issues in #883 and #893.
- Fixes the Dispose pattern for many classes.  Allows Dispose() to be called multiple times. Dispose() suppresses the finalizer.  Finalizer calls Dispose() if the developer forgets.
- Fixes GL object disposal so it copes with the GL context going away, the GraphicsDevice being disposed, and disposal on a worker thread.  Dispatches the disposal work to the UI thread, which is then performed during GraphicsDevice.Present().
- Ensure GraphicsDevice.Present() is called consistently amongst platforms.
- Game.EndDraw() now calls Platform.Present().
- Game now disposes Content and GraphicsDeviceManager.
- GraphicsResource.GraphicsDevice is now a WeakReference internally to cope with the GraphicsDevice being garbage collected out of order at shutdown.
- GraphicsResource-derived classes no longer add an event handler to GraphicsDevice.DeviceResetting.  This eliminates a strong reference that was preventing objects from being garbage collected.  Functionality is replaced with the global list of GraphicsResource objects and GraphicsResource.DoGraphicsDeviceResetting().
- There may be some other small fixes in there that I have omitted to mention.

Tested on Windows and Android.
Merge pull request #877 from Aranda/develop3d

Remove the double attenuation on the volume of SFX in Android
Merge pull request #897 from shilrobot/pack-structs

Change vertex structs to have StructLayout(LayoutKind.Sequential, Pack=1)
Merge pull request #900 from Nezz/ios_sensorfixes

Fixes sensor delay issues related to blocking main thread
Merge branch 'develop3d' of https://github.com/mono/MonoGame into dispose
Do not trigger the GraphicsResource.Disposing event if Dispose(bool) is called from the finalizer.
Merge pull request #905 from slygamer/dispose

Fixes to Dispose pattern and disposing GL objects
Adding second requireditem. Will later make it int32 and using negative for "or" cases and positive for and cases.
Set sizes for some table columns.
URL-import testi
Merge branch 'master' of github.com:Logima/ViiteArto
Added google places API,
might use cl-graph
asserte most heroku hack night graph vals, ins refs&queries to come
Do not allow direct access to properties map in EntityDTO
Added missing files needed for video/gps also updated bluetoothd from gb sharp but no change in scan speed
LiquidEngine and AtmosphericEngine can toggle EngineCommander
Added WorldPanel
Implementing Ten Task Achievement
[FIXES #29930981]
signup user
share project
sack
there we go
gitignore update to ignore ReShapre directory.
Cubie class represents a cubie block of 2 or 3 stickers.
format legend & history legend
fixed tablet ux css
INSTALL: update asciidoc recommendation

Since commit 6cf378f (docs: stop using asciidoc no-inline-literal),
we no longer support asciidoc versions less than 8.4.1,
which introduced inline literals. Note this in the INSTALL
document.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
replace: Add some clarification to doc
replace: Add example to doc.
replace: clarify use with files or trees.
filter-branch: balance quote in this comment
filter-branch: unconfuse vim

This is a non-functional commit, here simply to throw a bone to VIM's
syntax highlighter.
help: when passed an alias, display help for the aliased command.

if aliased command is a shell command, just name it (and identify it as
a shell command.

if aliased command has flags, display help for base command.
Fixup js/tools/statesManagement.js

Replace == with === and != with !==
Added Win32-VC SDL 1.2 Libraries
don't initiate auto-braking if we're already braking
return of the sprite
Poprawiony .gitignore + wyrzucenie kilku śmieci z projektu
Forgot the README file - I'm sorry