labofsahil/github-event-dataset-2012 huggingface dataset:
increased the pause for vnc waiting
Removed end of line of  Checksum calculation. Install kernel headers before vbox installation
wrong error in ssh command arg[1] -> argv[1]
bumped version
updated ssh_login_timeout to 10000 now that veewee 0.3 respects this value.
Merge pull request #277 from joemiller/patch-1

updated ssh_login_timeout to 10000 for veewee 0.3
added rake blast command to test all templates
Merge branch 'master' of github.com:jedi4ever/veewee
Fix typo in archlinux-x86_64 definition
increased ssh_timeout from 100 to 10000 for centos-57-x86_64
fixed download url on centos-57-x86_64
install kernel source and headers during initial kickstart install for centos-57.

This helps the VBoX Guest Additions install successfully during `postinstall.sh`. This happens
because centos 5.7 is installed (but 5.8 is latest) which means the 5.7 kernel
`2.6.18-274.el5` is installed during kickstart, but when `postinstall.sh` uses
yum to install `kernel-devel` and `kernel-headers` it will install the newer 5.8 kernel rpm
`2.6.18-308.el5`.
initial commit of centos-5.8 dvd templates
Merge pull request #278 from ampt/templates

Fix typo in archlinux-x86_64 definition
Merge pull request #279 from joemiller/centos_57_fixes

Centos 57 fixes
Made Gemfile happy with UTF-8 encoding
renamed rake blast to rake autotests
Merge branch 'master' of https://github.com/jedi4ever/veewee
ssh timeout is now 5minutes
Merge branch 'master' of github.com:jedi4ever/veewee
vimperator: togglとtoodledoのqmark追加
Updated and reorganized the math libraries.
add tiff coordsys
Merge branch 'master' of https://github.com/hanchao/easymap
Fixed seedwatch not working on reclaim

Just needed to add a check for game_type::DWARF_RECLAIM in two places
fix battleScene again
Adding .keep on the extjs directory, place your Ext here.
Starting to implement the refactored AST.
style: move tab-modal Cancel buttons to the right
emacs: don't allow M-RET to split line
fx: disable search suggestion
dactyl: simplify DDG setup
Defer to m2mhub.
Enable production labor reports.
weighted mean function added
WorkItem 4700: Fixed unit tests. Removed code commented in commit 5a679d7:

StoryHierarchyDAOHibernate:36:
iterationCrit.createCriteria("backlog").add(Restrictions.eq("parent", project));

This needs to be clarified, if it was mistakenly commented out or to fix a problem.
modif file templ papka tpl
build on a blackbox lisp hashupdate algorithm
reorganized most graphics code into graphics/
Simple caching of images. Some other changes.
Git ignore cache directory.
Updating trace file
fix other install instructions
Ready for Python3. Converted with 2to3.py
Add support for ircd-seven identify-msg (author unknown)
Basic IPTablesRole (only installs the package for now)
Comments to make explicit the different importing of NPMRole
IPTablesRole.list_rules() and list_rules_with_commands()
Allowing SSH connection as soon as IPTablesRole is provisioned
Docstring update
Making sure that the iptables rules are saved to the iptables config file when doing the final cleanup
Blocking remaining ports and protocols when exiting
Allowing input connections to all or specific ports
Allowing outgoing and forward connections
Allowing other protocols
Denying all protocols in all ports
Denying on different protocols
Denying on specific port
Denying outgoing connections
Refactoring role
Refactoring role
Docstrings
Improving documentation
Allowing and denying with match filters
Docstring update
Filter out spurious pep8 indentation reports

Filter out cases where pep8 reports indentation errors in lines that are
part of strings. This is a partial solution. If there are any real
indentation errors, the Reindent class will be triggered. It will then
format the whole file (including the contents of strings).
Avoid crash
Pass arguments down
Merge branch 'master' of github.com:hhatto/autopep8
port to kindle library powerpack
spring security: перенос части логики в фильтр и фильт в secure chain
commit work I did before lunch
I merged two people's work
vmware: write the code to acquire the info of localhost machine.
	and next step, I will seperate the code into different machines to
	achieve remote process call.
Load custom formats
Rule attribute stores its format instead of attribute
Support case insensitive keyword rules
Check for invalid attribute
FileHeaderEnforcement-3/15/2012 11:06:55 AM
Throw an exception instead of selecting 1st choice

When a hoa:// path cannot be resolved, we now throw an exception instead
of selecting the first choice. It avoids abstruse behavior.
Extend Composer support to hoa:// protocol.

First, we define the WITH_COMPOSER constant which is a flag set to true
if the core is loaded through Composer, else false. Consequently, we update
Hoa\Core\Consistency to use this constant.

Second, we create the Hoa\Core\Protocol\Library class to handle
components in hoa:// that refer to a library. This component will format
top-namespace and library name (respectively vendor and package with
Composer vocabulary) to lowercase if Composer is used.

Finally, we use this class when a component is called “Library”, such as:
hoa://Library or hoa://Data/Library.
url normalize
Additional host keys
Improve the comment describing the use of `msSetup()`
Set tab size to 4 for .py files.
turn backup into resource concepts
Restore setting state flag of replicated backup lost on recent merge
Merge pull request #96 from FranciscoBorges/master

restore lost line
HORNETQ-720 HORNETQ-987 Failback: Add timeout to backup announcement wait.
Merge pull request #397 from FranciscoBorges/failback

HORNETQ-720 HORNETQ-987 Failback: Add timeout to backup announcement wai...
Fix: Some fix into the canvas for companies.
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
Works on jQuery fileupload upgrade (Todo: css problem)
Fix: js not escaped
Fix: Regression with quot management. Try a better fix.
Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: Unescape a file submitted by upload. PHP escape char " (%22) and
char ' (%27) into $FILES
Before= Capture d\'écran.doc  After= Capture d'écran.doc
Merge remote-tracking branch 'dolibarr/develop' into develop
Add configuration option :activity_watch

When enabled, yeapsy informs contact address of new and deleted users (and more things in the future if necessary)
Add warning statingn that in production mode a minified js version is needed
Fix some styling issues with opera. Some minor formatting improvements in register box.
Merge branch 'master' into yeapsy-fyeg

Conflicts:
	.gitignore
Add Gemfile.lock
Merge branch 'master' into yeapsy-fyeg
multi mocks test

multi mocks test
Fixed slight mistake in Readme.
hotmail returns data in utf-16, decode it to utf-8
Wing Jacobian changed to local DOFs instead of global
Removed default GitHub changes because there is only Themes folder content
update release procedure
mention python needs to be compiled with sqlite
use python2.7 or python2.6, otherwise abort install
fixes #5
fixes #4
update changelog
CLI only scripts
Removed import controller
minor fix
Merge branch 'feature-map-mobile' of github.com:iRail/Ghendetta into feature-map-mobile
count_items being referenced before assignment oops
Private Message cleaned up with processCommands
Made passing of view data optional
Corrected logic error in 'exclude' option
added hintlayer
resolved conflicts to the current master
Merge pull request #87 from ilastik/hintlayer

Hintlayer
some buffs + a new part : WotLK debuff, disabled by default but some may need it. Unfortunately, reset Config is required. I'll have to work on some thing that solves this.
view switching bug fixed
view switching is finished
AI View controller was added
demo video and docs link
Typo
include unistd.h for some function declarations

getcwd, symlink, unlink, rmdir, readlink, chown, lchown, close,
getpid, getgid, getuid, isatty
add assignment operator to NamedValue

ISO 14882:2011 12.8 - 18
"If the class definition declares a move constructor or move assignment operator, the implicitly declared copy
assignment operator is defined as deleted;"
use std::make_shared where shared_ptr instances are required

removes compilation errors with 4.7 because construction of shared_ptr
instances is explicit and matches the convention used in the rest
of the code
include util/stringify.hh
fix warning regarding list-initializer

warning: list-initializer for non-class type must not be parenthesized
fix warning regarding enumerals in conditional expressions

warning: enumeral and non-enumeral type in conditional expression
Silence shadowing warning
Silence unused warning
Silence unused warning
Silence unused warning
Silence unused warning
Reorder CXXFLAGS to make warnings go away
Support GCC 4.7
Silence unused warning
master is now 0.73
Forward BlockDepSpec annotations to the contained PackageDepSpec

Doesn't really make much sense for them to have separate annotations,
and merging them like this means that the blocker's annotations are
visible to match_package, which is potentially useful.
Implement dsar_no_self_match
Disable self-blockers for Gentoo EAPIs

Apparently required by PMS, and also works around Portage rewriting
blockers into self-blockers in the VDB when a pkgmoved package
includes a blocker on its old name.
Fix general.conf exherbo world path example
better script log
Forgot to update README after last commit.
new functionality

added Linear Algebra and Matrix Math modules
added new Feature detectors
improved and extended matrixt_t initiation with custom data
switching to gpg for encryption
set specs to pending for now
Allow direct print of the notebook.

this improve the current css of the print page and add css to the
classical notebook with print as target to get a better print view ant
the ability to directly print a notebook without going through the print
view
Merge pull request #1993 from Carreau/printview

Update print-view css, and link the print css when trying to print a notebook without going through the print view.
added ability to move through the fields by pressing Enter - registration
addeed mult
Fix clock function docs.
Fix typo in clock macro.
Make implementation of ib_to_ptime a bit cleaner.
Update rule documentation on rule syntax and examples.
Mark the "extending ironbee" docs as out of date.
Moved code from modsec to it's own source file 'modsec_compat.c'
Fixed field names of 'uri' and 'protocol' in stream header rules
Reworked the syntax of rules:

Rule tgt1 tgt2 @op "value" mod1 mod2
Allow for empty quoted parameters in configuration (i.e. "")
Added an operator flag to indicate whether the operator supports
capture or not.  The rule parser checks this flag when it encounters
a capture modifier, and generates an error if the flag is not set.
Fixed a doxygen error
Fixed a clang warning
modified:   index.html
	modified:   js/keo.js
test
db create
improved Module load() and Module import()
use Wonder classes/methods for response generation

• use pageWithName(Class) instead of pageWithName(String)
• use ERXResponse instead of WOResponse
• use ERXRedirect instead of WORedirect (will honor context secure status)
• return a 403 response if canPerformActionWithPasswordKey did return false
direct actions should have return value of WOActionResults
fix javadocs
Fix bug that checks for log4j settings instead of testing settings - this prevented the ERXWOTestInterface from loading properly.
Merge pull request #136 from darkv/ERXDirectAction_patch

ERXDirectAction patch
MooTools added MTAjaxInPlace based on the original AjaxInPlace. Also added an example of it's usage to the example project.
MTAjaxInPlace java file. Forget to commit it with the others.
add Method : trimZeroInFrontOfNumbers

trim leading 0 from a (Number) String
add 3 Methods to ERXArrayUtilities

arrayIsNullOrEmpty(NSArray)
arrayIsNullOrEmpty(NSMutableArray)
arrayToLogstring
javadoc

japanese javadoc
3 new Methods to ERXValueUtilities

String[] stringsToStringArray(String ... anyStrings)
Object[] objectsToObjectArray(Object ... anyObjects)
String stringArrayToString(String[] sa)
ERXProperties new 6 Methods

String stringFor2Keys(String s1, String s2)
String stringFor2KeysWithDefault(String s1, String s2, final String defaultValue)
stringFor3Keys(String s1, String s2, String s3)
stringFor3KeysWithDefault(String s1, String s2, String s3, final String defaultValue)
stringForManyKeys(String[] ss)
stringForManyKeysWithDefault(final String[] ss, final String defaultValue)
New TCP/IP Class

This Class provide some Helper for TCP/IP and is the foundation for a new Method in ERXProperties. english javadoc will be provide later.
new InIpRangeOperator class

Provide Properties setup like

test.sampleip3.@forIP.192.168.1.50-192.168.1.90 = avalue
delete 2 duplicated Methods

Thanks to Pascal and darkv
javadoc

japanese javadoc
javadoc

japanese javadoc and english javadoc fix
fix some javadoc
add valueFromPlistBundleWithKey

Returns the key in an plist of the given framework.
@param bundle - bundle name
@param plist - plist Filename
@param key - key
@return Result
change repeating code to one Method

fix also some deprecated calls
removed trailing whitespaces in lib/ImageIO/CMakeLists.txt
Merge remote-tracking branch 'group/master'
add adaptions to vec3 for itkAdapter
Merge remote-tracking branch 'group/master'
Merge remote-tracking branch 'group/master'
Merge remote-tracking branch 'group/master'
Merge remote-tracking branch 'group/master'
Merge remote-tracking branch 'group/master'
Merge remote-tracking branch 'group/master'
copy the internal stored orientation members of image in operator=
Merge remote-tracking branch 'group/master'
add entry to gitignore
changed gitignore
isis::util::FixedVector::sum has to be a const
Merge remote-tracking branch 'group/master'

Conflicts:
	lib/Adapter/itk/itkAdapter_impl.hpp
Merge pull request #69 from Rollmops/master

isis::util::FixedVector::sum method has to be const
copy the internal stored orientation members of image in operator=
Last changes from report writing
Fixed the manual - constant now
clients screen has total hours and uninvoiced hours
Refactored common methods into interfaces/abstracts
Remove unneeded import in wsgi.py
Fix link to production docs
Merge branch 'gnip-30' of git://github.com/iwillig/geonode into dev
Merge branch 'dev' of https://github.com/GeoNode/geonode into gnip-30
Not sure why we needed a different package to serve an wsgi application with a wsgi server. Remove dj.paste as a requirement and just use normal paste.
Removed the pythonrc settings for pinax.
lisp/ffap.el: (ffap-search-backward-file-end): punctuation support

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Support for three grid systems: semantic.gs, columnal and blankwork.
Merge branch 'HEAD' of git@github.com:jacmoe/yiistrap.git
Fixed banner sizes.
Merge branch 'master' into test-registration
Avoid error being thrown when exercise page is navigated to directly.
removed unused libraries
updated pom.xml
started functionality for replying to PMs
Added status handling
add getters
let Pozdrav use Status
forgotted add listener to muc
fix PluginManager
Accept also "<Botname>: command" instad of "<prefix>command"
do not receive history
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/eu/janinko/xmppmuc/Commands.java
gitignore
Merge remote-tracking branch 'jar/master'
Sacados algunos files que NO deben ir en el REPO. Buenas prácticas
Luego de correr rails destroy model cliente
Scaffold de clientes
Merge pull request #1 from dcaliri/master

Enjoy!
Added top2 position
Replace .remove() with .detach() in bootstrap-tooltip.js 

Replace .remove() with .detach() since, detach do not remove all event listeners, which makes it easier to extend the script.

I realize this when I tried to make a popover which stayed visible when you hovered it.
Added action support to event scripts
Fixed regressions in the jazz validation suite
Delay authentication until calling login directly
jetty7, ajout en base de donnée sur mysql
Scalar product problem
Update to ballroom 1.5.0.Final
Added installer files
Alterei horario
Merge pull request #134 from tomasc/master

Pass options of self.decorates_association to self.decorate
CDGServer supports multi-dir
updated demos- made pong more pong-like
Issue 878: cloudstack locations are zones, not regions
refactor PropertiesBuilder and related types into ApiMetadata and ProviderMetadata, and update all usage
revert back to openjdk6 and without implicit apt-upgrade
Remove unused copy method

Also make second copy method private access.
Merge pull request #617 from andrewgaul/filesystem-transient-remove-copy

Remove unused copy method
Attempting to solve Heroku push (sqlite3)
improve use from many threads

lock around the operation cache and the upstrea/downstream link system
so vips works when used from many threads: you can now create an image
in one thread and process it in another
Merge remote-tracking branch 'origin/7.28'

Conflicts:
	libvips/iofuncs/generate.c
	libvips/iofuncs/init.c
	po/vips7.pot
Clean up README a bit, fix numbering
Update .gvimrc for better looking font
debugging gtbale style
Guesses count down, and user input is compared with random number generated between 1 and 100 that is stored in sessionStorage. If user input matches sessionStorage, then alert is displayed
add not and contains support
Implemented cat, min, and js
Merge branch 'master' of github.com:jdreux/streamUR
changed search box style
add VS2010 solution and projects, add #if for Main() in UnitTests.cs
Fix missing reference bug
CBitcoinSecret::SetString() now calls IsValid() to make sure it was passed something with the correct version.
Show a message box when runaway exception happens

This is more clear to users than when the program simply disappears (usually during initialization). It still logs the message to the console and debug log as well.
Bugfix: Check that QRcode_encodeString didn't return NULL (error)

Without this, any error will segfault Bitcoin-Qt
enable all warnings except invalid-offsetof, sign-compare, unused-parameter
work around issue in boost::program_options that prevents from compiling in clang
fix warnings: array subscript is of type 'char' [-Wchar-subscripts]
fix warnings: 'XX' defined as a struct here but previously declared as a class [-Wmismatched-tags]
fix warnings: enumeration values 'XX' not handled in switch [-Wswitch-enum]
fix warnings: unused variable 'XX' [-Wunused-variable]
fix warnings: delete called on 'XX' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor]
fix warnings: '&&' within '||' [-Wlogical-op-parentheses]
fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Merge pull request #1100 from luke-jr/qrcode_errchk

Bugfix: Check that QRcode_encodeString didn't return NULL (error)
Merge pull request #1097 from laanwj/2012_04_runawayexception

Show a message box when runaway exception happens
Merge pull request #1084 from dooglus/validate_secret

importprivkey doesn't check that it is given a private key
Merge pull request #1104 from laanwj/2012_04_clang

Enable and fix most compilation warnings
New class CTxMemPool, encapsulating TX memory pool data members
CTxMemPool: encapsulate AddToMemoryPoolUnchecked(), RemoveFromMemoryPool(),
and nPooledTx
CTxMemPool: encapsulate AcceptToMemoryPool
CTxMemPool: add helper methods, to reduce global mempool.mapTx accesses
Added script calls to the footer
remove defhelper
implement and test letpattern
Check for validity before blessing tmp elements
Add network serialization objects for password changes
Add no-functionality server request support
Reduce boilerplate in serialization
Client is currently test code. Fixed bugs.
Merge branch 'stub-password-request' of git://github.com/jhance/GridToGo

Conflicts:
	gridtogo/shared/serialization.py
Fixed bugs in the yet-to-be-fully-implemented password reset
functionality.
Crazy untested code invloving gtk3 integration in the client, and
DeltaObjects.
We are ready for a UI!!!
crossing fingers on the error
updated at Fr 13. Jul 04:50:17 CEST 2012
Fix exception when submodule SConscript has not yet been downloaded.
rm controller template
add zigzag traverse
Vim configuration: Reminder for `expandtab` and makefiles
Git configuration: Alias for uncommitting
Removing replicate_use_default_rsync_options setting and setting replicate_rsync_options to existing rsync default.  Issue #58
add HTTP header caching and if-none-match/if-modified-since support to http library
go/printer, gofmt: trim trailing whitespace in comments

Also: updated go fix testcases to pass tests.

Fixes issue 4310.

R=r
CC=golang-dev
http://codereview.appspot.com/6810055
Start of radio generator.
Radio web objects can be referenced by the platform.
Radio web objects can be manipulated by the platform.
Radio acceptance tests added.
Merge branch 'radio_generators' into develop
Removal of superfluous text method and test.
Text method not removed in previous commit.
Enabled and disabled calls for web objects.
Text calls for web objects.
Exists and visible calls for web objects.
Removal of clear action for radios.
Merge branch 'extend_web_objects' into develop
remove loading of all files except index.html
Adding admin-css function to fire for backend.
Adding updated akismet.
Handle non-array hdrs param
Prep for 1.0.5
Extract createEventDispatcher from Application#init
Simplify syntax so we can extract more easily
Extract runInjections from Application#initialize

This also runs the injections on the newly created router property,
because we collect the keys after adding the router. But this shouldn't
do any harm.
Extract createRouter from Application#initialize
Add Application#reset

This is mostly useful for testing.
rearrange shell quoting in configure.py
fix quoting thinko
1144 - Yekkanti migrated user_login.feature from webrat to capybara
1144 Yekkanti- Migrated user_time_zones, create_and_view features from webrat to capybara
Merge branch 'rails30_upgrade' of github.com:jorgej/RapidFTR into rails30_upgrade
FUCKIN A
Merge remote-tracking branch 'origin/master'
Forgot to link against pthread.

Signed-off-by: Joshua Piccari <joshua.piccari@gmail.com>
Sockets refinements, initial server command interpreting, client work more-or-less complete.

-Refactored socket_recv() to be more conducive to the flow of the application.
-Fixed bug in server_loop() that unlinked our socket while we were still using it. Moved unlink() to outside the loop.
-Added most of the client request code, 90% complete.

Signed-off-by: Joshua Piccari <joshua.piccari@gmail.com>
Fix to prevent LV /vgsystem/tmp to take all remaining disk space in VG.
Merge pull request #15 from mdklapwijk/2disk_sd_lvm_multiraid-fix

Fix to prevent LV 'tmp' to take all remaining disk space in VG 'vgsystem'.
haku muutettu geneeriseksi, muokkaus-luokka luotu
toimiiko?
Update submodule vim-smartinput url
Work around OSVERSION checks, fix sysctl for number of cpus

The makefiles use OSVERSION extensively to check for FreeBSD features
to either abort the build or do something differently.  Inserting the
DragonFly OSVERSION there is meaningless.

Hardcode OSVERSION to 9999999 to simulate the latest FreeBSD version
and hopefully this will allow builds on DragonFly by default.  If
not, a patch will have to be used to remove the check as
Makefile.DragonFly trick doesn't work for all targets.
Import games/xblackjack version 2.2_3
Import textproc/libmrss-php version 0.19.2
Import devel/libopensync022 version 0.22_2
Import deskutils/msynctool version 0.22
Import japanese/ochusha version 0.5.8.2_10
Import databases/p5-DBD-Sybase version 1.14
Import print/p5-Net-CUPS version 0.61_1
change location of the action buttons
update name of image helper for admin pages
slight refactor, bug fixing, more examples
jobs index and my/jobs show activated_at time instead of created at
added link to my/jobs if logged in
fix most evil issues from running a static code analysis

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@413 14438d79-0ffd-4333-8ae7-ea2bdd901387
resurrect outdated FXAA software code

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@414 14438d79-0ffd-4333-8ae7-ea2bdd901387
fix some more static code analysis warnings

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@415 14438d79-0ffd-4333-8ae7-ea2bdd901387
change toolset in VC2012/Update1 project to support WinXP

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@416 14438d79-0ffd-4333-8ae7-ea2bdd901387
SSE2-optimize the software FXAA implementation

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@417 14438d79-0ffd-4333-8ae7-ea2bdd901387
optimize software FXAA implementation

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@418 14438d79-0ffd-4333-8ae7-ea2bdd901387
optimize software FXAA and 3D stereo implementations

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@419 14438d79-0ffd-4333-8ae7-ea2bdd901387
add cpu-gen-specific codepaths

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@420 14438d79-0ffd-4333-8ae7-ea2bdd901387
optimize software FXAA implementation and add correct border handling

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@421 14438d79-0ffd-4333-8ae7-ea2bdd901387
add 16bit/pp FXAA implementation

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@422 14438d79-0ffd-4333-8ae7-ea2bdd901387
(un)wire more FXAA code

still via defines, UI wiring will follow

git-svn-id: https://vpinball.svn.sourceforge.net/svnroot/vpinball/trunk@423 14438d79-0ffd-4333-8ae7-ea2bdd901387
corrigindo tempos verbais
Fix test for util::get_program_name
kbd added
xxx
Merge branch 'master' of github.com:julyzergcn/test

Conflicts:
	testtime
deb
rvm for ebookmakr
addd sss, philhealth deductions, provision for tax and pagibig
Added support for mustache nested contexts within sections.
Added support for deeply nested context in mustache.
Updating steal.production.js
less test working
coffeescript tests all pass
steal/browser, phantom, and steal/html all working
vimrc: enable session, but don't save globals
Connected settings window with settings file
Renamed file for service consistency
Added some functionality to the site
Whitespace fix
Minor changes to tools/proof
Added test/python to EXTRA_DIST
Simplify feat-option_py.test
Added a test harness error diagnostic
Merge branch 'yaw-servo-class'
wiki/notes in sidebar for searches, grid/list
video in sidebar
book icon for wikis
Moved k-control projec to anover forlder for separated workspaces
Sotilaat toimivat oikein
in the library with @ameenudeen @adeel @ kaiquan #2days
tested and edited ballroom progress bar
Pushing to test on devices
Merge branch 'master' into gh-pages
added dummy menu items, logo not linking to aalto-menu
宣传广告
Add --source-map-url to specify the URL to the .map file
fixed for all link no text-decoration.
initial commit.
Merge branch 'master' of github.com:kamiyama/blogos

Conflicts:
	.gitignore
fixed for action cache.
Merge branch 'master' into pamyusoku

Conflicts:
	app/controllers/root_controller.rb
	app/views/root/index.html.erb
Define a step to verify a installed flavor
Load vim-flavor before running tests
Mark WIP features to bootstrap
Add a skeleton of Vim::Flavor::CLI
Add a skeleton of the "install" task
Implement "install" task with imaginary code
Define StringExtension
Use StringExtension if possible
Add a skeleton of FlavorFile
Add a skeleton of LockFile
Add a skeleton of Flavor
Define FlavorFile#complete
Define Flavor#load (dummy)
Define FlavorFile#flavor_table
Define FlavorFile.load
Define LockFile.load_or_new (dummy)
Define LockFile#flavor_table
Define LockFile#update (dummy)
Define LockFile#save (dummy)
Define LockFile#flavors
Lift 2.5-SNAPSHOT builds published to sonatype.
Standardize function documentation by adding callback to parameter list.
Make back button go to list of components when a component is focused.
To Pass test
initial core project setup
first pass at adding some core objects
Fix names for icon assets.
Change key configuration to use space to fire guns, F to fire bombs,
and W/E to strafe left/right.
新增任务处理失败的LOG，调整egame接口
solved problem 55 and rename euler.py to euler
twitter bootstrap integrated
update modules
Added bindable read-only variables.

Also fixed bugs with needed on the way.
Added Java and Node.js note files
build war package for tomcat deployment. use ant target pkg.tomcat.war
fix bug: StackOverFlow exception caused by HtmlUnit execute the home page javascript (refreshOnExpire) after successful login.
use <mvc:default-resource-handler /> to handle static resources,such as css,javascript,images instead. the original implementation requires dependency on Jetty defaultServlet.
fix a bug:  servelet-api-*.jar is not excluded correctly when build package for tomcat.
Add module concept
Add outputs folder
Надо бы сделать...
Refactor archive pull
Changed the CheckOut signal in BookingHandler so that no new booking is created when BookingHandler handles the signal.
Made white config default
update fp.html
block 2012
Use MyISAM for cdi log table
Merge branch 'release/0.1.0beta' into develop
Fix docs
Update version
Merge branch 'release/0.1.1beta'
Move to img.
Some plotting abstractions; animation.
Don't need it.
Don't count the hypothesis.
Don't count the hypothesis.
4 instead of 25 fps.
20 instead of 30 nodes.
edits to commit section
amended get_combined_value.
added install-vps-util
Добавил файл настроек
--
Изменил гитигноре
Еще изменение в gitignore
Изменил ридми
Изменил меню в админке

Почему-то потерялось меню для магазина
Правка багов

В основном правил баги.
Некоторые изменения в стуктуре ентити
Squashed commit of the following:

commit dcb759fb52b2b033f3d8800a41bcbe9aea06d060
Author: kostyakch <kch@list.ru>
Date:   Thu Apr 12 12:20:53 2012 +0400

    Ошибка при входе в кабинет

    Возникает если пользователь не является покупателем

commit 7e3026f873ebff24417e6cb7bf9af33345dad7c7
Author: kostyakch <kch@list.ru>
Date:   Thu Apr 12 10:56:37 2012 +0400

    Ошибка

    Ошибка при входе в корзину, если входящий не является покупателем
Отремонтировал свойства
Сделал сортировку категорий в редакторе товара и др.

Еще изменил форму редактора товара (внешний вид)
Функция для отображения имени вместе с парентом
Merge branch 'refs/heads/content_parent' into cms

Conflicts:
	.gitignore
	app/config/parameters.ini
	src/Application/BackBundle/Controller/BrandController.php
	src/Application/BackBundle/Controller/CategoryController.php
	src/Application/BackBundle/Controller/PropertyController.php
	src/Application/BackBundle/Form/ProductForm.php
	src/Application/BackBundle/Resources/views/Product/add_edit.html.twig
	src/Application/BackBundle/Resources/views/Product/list.html.twig
	src/Application/BackBundle/Resources/views/Property/list.html.twig
	src/Application/BackBundle/Resources/views/layout.html.twig
	src/Application/CommonBundle/Entity/Category.php
	src/Application/CommonBundle/Entity/Content.php
	src/Application/CommonBundle/Entity/Product.php
	src/Application/CommonBundle/Entity/User.php
	src/Application/CommonBundle/Resources/config/validation.yml
	src/Application/FrontBundle/Controller/CabinetController.php
	src/Application/FrontBundle/Controller/ProductController.php
	src/Application/FrontBundle/Resources/views/Content/index.html.twig
	src/Application/FrontBundle/Resources/views/Exception/error.html.twig
bluetooths footprint corrected to actual dimensions
bluetooth module replaced with new version
add option to exec a proc when displaying a field value instead of the value in record. useful for displaying related object data
datetime help-block
Update meow-deploy conf
My first commit
Merge branch 'master' of https://github.com/krovvy/GetupMVC
client still far from working

Kundes Schritte
1- leo de socket1 (pongo el socket en espera y agrego la data a pendingData pero poniendo como key al socket2 ) en sendForward
2- creo la conexion para el socket2 (lo pongo listo para escribir) en sendForward
3- escribo en el socket2 (en write -> cuando lo llama run) dejar todo como está en write
4- leo del socket2 (en write -> lo cierro ) hay que modificar read para que le pase el evento al worker que debe saber que viene del servidor exterior
5- el worker debe procesar la request y debe enviarle el evento nuevo al servidor interno con sendAnswer (es muy importante que el socket del evento sea el socket1)
5- escribo en el socket1 lo que lei del socket1 (en write tal cual está, sin tocar nada)

no modifico pendingData, no modifco write , modifico read
el evento debe ser modificado para que se pueda indentificar si es para el cliente o para el servidor

* envio el envent del server al cliente con sendFoward
* envio el evento del server al cliente con sendAnswer
Merge branch 'issues/4' into development
fix logic de worker
fix workspace
Merge branch 'development' into issues/4
starting with maven, no funca nada
Merge branch 'request2' into development
Merge branch 'request2' into issues/4

Conflicts:
	src/main/java/org/chinux/pdc/Worker.java
Merge branch 'development' into issues/4
compiling failure fixed
upstream patch-3.0.44-45
upstream patch-3.0.45-46 manual full merge!
we have /kernel/sched/core.c
not kernel/sched.c
wakelock: use single threaded workqueueus

Avoid the concurrency management that could delay execution if there's
lots of workqueue traffic (and allow the runqueue to run on any CPU).

Lots of workqueue traffic can be generated by setting
ondemand/sampling_rate to 10000.

Change-Id: I55b8a223f4a389b93d49eef0d809eb1efe1790ba

Signed-off-by: Andrea Arcangeli <andrea@cpushare.com>
Revert "Activated Dyn Sync Control and addapted to 3.2.y code."

This reverts commit d7d5d2182eabc74a6a2ce8b8e40c49def5adbcd4.

Screen turning ON for one sec after screen off.
and to sync files only on screen off, is not what we want.
nice idea, but i skip.
Revert "fs/dyn_sync_cntrl: dynamic sync control"

This reverts commit c6b33a87b9757052b0c87de60c6f375642f0344c.
changed rest-return-btn
swipejump削除
rename
prepared for v0.0.6 gem
Merge branch 'master' of github.com:kudelabs/ad_man
merge
Existe boton de reject
Existe boton de reject
D
Merge branch 'master' of github.com:kurenn/scrumAid
Corregir bug en creacion de features
Adds <CR> to output :nohlsearch
Merge branch 'master' of github.com:kurko/.dotfiles

Conflicts:
	vim/vimrc
transfer to home computer.
Added alias to edit bashrc.
Added alias for terminitor.
Minor compatability for non-git and /bin/sh only environments
Fix junk I shouldn't have committed.
Fix small typo in validation docs.
Merge pull request #852 from JeffreyWay/patch-1

Fix small typo in validation docs.
added server configuration to install docs
Merge branch 'feature/installation' into develop
Merged Linject into the core IoC container.
Adding Schema::rename('oldtable','newtable') support

Signed-off-by: Colin Viebrock <colin@viebrock.ca>
One more change (comments may need to be altered)
Signed-off-by: Colin Viebrock <colin@viebrock.ca>
Fix ... thanks Vespakoen!
Documentation: Add link to Controller Routing section to Routing submenu.
Documentation: Fix typo on routing page's TOC.
Fixing multiline Blade comments, making closing comment tag required
Updating docs for Blade comments
Fixed bug where the profiler did not correctly put quotes around bindings
Improved the way the quotes were added to the bindings.
Grammar/Vocabulary fixes

Signed-off-by: Chris Berthe <chrisberthe@gmail.com>
Resolved autoloader conflict

Signed-off-by: Chris Berthe <chrisberthe@gmail.com>
Blade cleanup

sanitized most functions and regular expressions. made the bigger
functions a bit more solid, flexible in what they ignore and simplified
various processes.
Merge remote-tracking branch 'upstream/develop' into develop
added break function to closing structure
Added explanation about PDO default attributes

regarding issue #788

https://github.com/laravel/laravel/issues/788
Calculate the total render time in the profiler.
Render page generation time on anbu profiler console.
Use start_time attribute like a static attribute (as it is).
Updated the dd function to var_dump inside pre tags, makes is a bit more readable
Simply use the LARAVEL_START constant for calculation page generation time in profiler.
vim: don't try to autocomplete without hitting tab
Save command history in GDB
bash: XDG_CONFIG_HOME moved from profile to rc
Correction  of multiple errors in SortOperator
started writing of formatted zorba testsuite tests
implemented line wrapping in FormatWriter. correcting testcases, work in progress
adapted testcase expected results to new line wrapper
implemented proper argumentlist formatting, putting multiline args on their own lines. fixed minor wrapping bugs.
Disabled folding and added <leader>s for ConqueTerm
improve the mouse support a lil bit
Fixed a os compatibility bug with the bin locations.. and added an exec description.
Included the path requirement.
Merge branch 'release'
Merge branch 'master' into develop
Merge branch 'develop' into work
Incremented the working version number.
Added the missing date to history. Oops.
Added the working version to the changelog.
Merge branch 'work' into develop
Incremented the devDep Dork version.
Added a fix for CoffeeScript testing so that CoffeeScript will be imported from directories relative to the testing file.
Fixed an issue with user supplied directories being cropped off when importing coffeescript.
Merge branch 'work' into develop
Merge branch 'develop' into release
Added some param handling to proto._add_route, along with a pattern format call.
Added format_route_pattern()
Added a place holder file for a history listener and middleware.
Fix ambiguous conversion.
Add notify event.
Add Functions Accessing Table
Cleanup previous garbage.
Fix signal connections.
More cleaning..
Interface milestone
Updated plugin.yml. Updated config.yml.
Merge remote-tracking branch 'origin/master'
Added probablePrime overload.
增加ReadME.txt
testing markdown for Multitool
Fix workdir iterators on empty directories

Creating a workdir iterator on a directory with absolutely
no files was returning an error (GIT_ENOTFOUND) instead of
an iterator for nothing.  This fixes that and includes two
new tests that cover that case.
Merge pull request #708 from arrbee/fix-empty-workdir-iterator

Fix workdir iterators on empty directories
Bump the builtin http-parser
Merge pull request #1064 from libgit2/http-parser-2

Bump the builtin http-parser to v2.0
Handle document creation errors.
README.rst:  Fixed a typo.
impelement visitor
optimize AST form.
remove unnecessary file.
wongs wurf
删除图片7
Update LICENSE to WTFPL.
redirect on condition
throw on error event and minor fixes
ENYO-1341 - Removed unguarded use of the console object throughout enyo core. Phonegap, and tools were left as is, and loader.js, boot.js, and platform.js don't currently suppor the enyo.log call.
Enyo-DCO-1.1-Signed-off-by: Chris Patalano <chris.patalano@palm.com>
ENYO-1514: minifier will not force relative path for external links in url statements
Merge pull request #193 from clinuz/master

ENYO-1514

Reviewed-By: Ben Combee (ben.combee@palm.com)
Merge pull request #194 from enyojs/1341-patalano

ENYO-1341 - Removed unguarded use of the console object throughout enyo ...

Reviewed-By: Ben Combee (ben.combee@palm.com)
ENYO-1442: add links to built-version of enyo.css for all single-page samples.  This fixes their use from the nightly sampler site while just resulting in a minor 404 error in local use.
Also updated body tags to add onyx style for pages that use onyx controls

Enyo-DCO-1.1-Signed-Off-By: Ben Combee (ben.combee@palm.com)
ENYO-1532 - Added support for scrollTo() to TransitionScrollStrategy.
Enyo-DCO-1.1-Signed-off-by: Chris Patalano <chris.patalano@palm.com>
Kevin suggested simpler fix that just uses one extra level of directory indirection instead of pulling in enyo.css directly.

Enyo-DCO-1.1-Signed-Off-By: Ben Combee (ben.combee@palm.com)
Merge pull request #196 from enyojs/1532-patalano

ENYO-1532 - Added support for scrollTo() to TransitionScrollStrategy.

Reviewed-By: Ben Combee (ben.combee@palm.com)
ENYO-1550: dispatch a tap event when spacebar is used on an input

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@palm.com>
ENYO-1610: onyx and enyo Buttons rendered differently in Firefox than webkit
Merge pull request #198 from enyo-surya/master

ENYO-1610: onyx and enyo Buttons rendered differently in Firefox than webkit

Reviewed-By: Ben Combee (ben.combee@palm.com)
Merge pull request #197 from clinuz/master

ENYO-1550

Reviewed-By: Ben Combee (ben.combee@palm.com)
Merge pull request #195 from enyojs/ENYO-1442

ENYO-1442: add links to built-version of enyo.css for all single-page sa...
ENYO-1562: Scroller thumbs shouldn't show if vertical or horizontal is set to "hidden"
Fixed it for now, but eventually the Scroller code can be optimized further to avoid doing any calculation on flick if a certain direction is set to hidden and we know that upfront. For example, if we know that the horizontal is set to hidden, why even calculate the scroll positions in that direction - simply ignore that direction altogether to achieve better performance.
Merge pull request #199 from enyo-surya/master

ENYO-1562: Scroller thumbs shouldn't show if vertical or horizontal is set to "hidden"

Reviewed-By: Ben Combee (ben.combee@palm.com)
modify 回复意见跳转

Signed-off-by: guoxuewen <13651268009@139.com>
upd
Merge branch 'develop' of https://github.com/lnczx/lnc-hj-os into develop
switch zoom in and zoom out button positions
missing delete from players array
general TopologyTraits class
Adopt new rime API; show comments in gray text.
Improve proposal data with little info label, action button for proposal owners and minor css improvements.
Create HeaderReader
Create test
change thunderbird min version to 5.0
Change all Components.classes/interfaces/utils refs to Cc/i/u for consistancy.
changed const to let to avoid var redeclaration
Merge pull request #9 from dlech/master

Make Components.interfaces, etc. shortcuts consistant
CMake stuff
Remove Java code
Started addin SWIG configuration for Wrapping.

And focused on Python wrapping first.
Fixed generation of .cxx in wrapping.
Fixed Wrapping of GTM.h.

The header file was missing from the explicit list that SWIG needs.
Fixing C++ warnings, as reported by -Wall.

Enabled the -Wall compilation option, and fixed the warnings that
were reported.
Solved library dependencies and use of PIC flag.

The shared library containing the Python wrapping depends on the
ccpgtm libray, and that one in turns needed the -fPIC flag in order
to have relocatable code.
First test/example of GT.M Python API.
Renamed Python module. Configured scripts.

Renamed the Python module to be "gtm" instead of "GTM" to be more
consistent with the language style.

Added configurable scripts to help run the examples/test. They are
put now in the LIBRARY_OUTPUT_PATH. It is not elegant, but it is
convenient.
Adding methods with std::string return by copy.

These functions are provide more natural expressions when wrapped
in Python. They map to the expected  var = object.Get()  syntax.
Make Python wrapped functions lowercase.

To better match the standard style of python scripts.
Fixed bug. typo introduced extra comma.
Bug: returned strings needed null terminator.

The method Get, Order and Query, needed to set the null terminator
in the strings that they were returning as simple char arrays.
Bugfix: Avoid trying to flush block file when importing
UNTESTED DRAFT: bitforce: Support for Mini Rig nonce range scan
Added presentations and fixed some formatting.
Fix Auth Issues - FB, Twit, GooG to Settings.YML
bind() binds-down to canvas
MainRenderer added
Merge branch 'master' of github.com:lwrobel/eto2012
Angles added to vector, rotations of elements etc

Not finished!
Added CGGeometry supports. Only addition for CGSize for now.
Switch from string.letters to string.ascii_letters.
remove trailing blank line
randua
Fix mitype
Merge branch 'master' into orz
removed bootstrap files
left and right arrow keys now clicks on prev and right anchors
array access parsing+
use bind-key.
more rearranging.
using lusty-explorer.
use bind-key for keybinding assignment.
cosmetic.
gnu-efi: Version 3.0r
edk2: Bump version
Disable the debug option for FFADO

The debug option is enabled by default and causes performance and stability issues
Update the calf plugin pack to 0.0.19-rc7

This is a significant update with loads of new features, plugins and GUIs
Tidy up the expression for the Calf audio plugin pack
rEFInd: 0.4.5
Upgrade libraw1394 to 2.1.0
neko: Correctly set 64bit mode in build.

Neko seems to think it is running in 32bit, even though it is compiled for
64bit. The fix is included in 1.8.3, which is not yet released as of now, so we
add a temporary fix until the release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Merge branch 'refind' into upstream
libicns: Bump
haxe: Remove build files of haxelib/haxedoc early.

Previously, we installed std by omitting the tools directory. Now, there are
occasions where you actually want to use things like tools.haxelib from within
your project, for example to create something that interfaces with the haxelib
API. So we now just remove all files in there that were created during the main
build in postBuild.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
llvm: Bump to 3.1
clang: Bump to 3.1
Add libc++
cmake: Bump
haskell-cabal-install: add version 1.16.0
haskell-Cabal: update to versions 1.16.0.1
haskell-tar: update to version 0.4.0.1
haskell-persistent: jail-break to support current versions of lifted-base
haskell-resourcet: jail-break to support current versions of lifted-base
Added time limit to the http request.
websockets only broadcasts if there are clients, moved broadcasting to util-actor
added proposal repo
[mr2541] Implement change area notifier.
[mr2196] move BattleGround code to separate dir (as OutdoorPvP). also some corrects to unload BG's
SD2 update
[mr2197] allow 4.4.3, 4.3.0 and 4.0.6a connect to realmd
Merge branch 'master' into testing
some additional checks in CreatureCreatePos::SelectFinalPoint. related to #1134
impement and use CheckPosition() method in VMAP namespace. related to #1134
restore initialization, forget in mr2191
Squashed commit of the following:

commit 8c616807e540a33bb15bac4495187a23b3b50111
Author: rsa <kris13@bk.ru>
Date:   Fri Oct 5 16:06:34 2012 +0400

    small corrects and improve logging in Unit::DealDamage

commit 17d8514d6cc42b32b88d9d77a9177792257c86c0
Author: Schmoozerd <schmoozerd@scriptdev2.com>
Date:   Fri Oct 5 01:44:19 2012 +0200

    [12192] Fix loot problems introduced with recent commit. Thanks to Jethro for pointing

commit 2a33db6837ce41f88275887eed0a9a4b8d8045fe
Author: Schmoozerd <schmoozerd@scriptdev2.com>
Date:   Sun Sep 9 23:06:44 2012 +0200

    [12191] Re-Order processing on kill in Unit::DealDamage

    Please test and feedback results if there are unwanted side-effects.
    Especially do tests related to duels, Priest-Talent SpiritOfRedemtion if the new order causes any problems

    Based on work by xfurry

    Conflicts:

    	src/game/Unit.cpp
[mr1974] code style
I use now Eclipse, so i have some code style marks :)
cleanups in ObjectAccessor. not use ObjectAccessor singleton in ThreatManager::processThreatEvent. Related to #1068, testing.
css cleanup and fixed centered layout
align top for left content
Merge pull request #1 from mariuz/master

merge css
moving updateSubModules around
Initial skeleton for ModifyState dialog
More progress on modify state dialog.
Get BODY appstates to show always in Scenes palette
Theme editor broken by previous checkin.
Various UI changes, mostly to States/Scenes palette.
Get initial state checkmark logic working in States palette.
six #3016 - clear dialog reference in datastorebasedwidgets
Fix link in review invitation (#2108)

The DavinciReviewServlet was recently disabled. So, review link URL's
now need to be processed by DavinciPageServlet. This means the old
review link URL's using /review as the context root don't make sense
anymore.

Added processing of the review-related attributes to
DavincePageServlet. And, along with removing /review from the URLs,
took the opportunity to further simplify the URL and make it easier to
read. 

Links to reviews will now be in the form of:

http://localhost:8081/maqetta?reviewDesigner=userA&reviewVersion=20120502112254
Fufill updates
Separação de mascara de celular e telefone fixo
fixed credit logic
fixed db schema
boulot boulot du mardi
Added support to cardinal and ordinal numbers.
Small fix to ordinal numbers matching.
Merge pull request #39 from giuliopaci/4.x

Number expansion for Italian, in 4.x branch